172 files changed, 10327 insertions, 10327 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
index 9d807c84f..bf70ebca4 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
@@ -1,27 +1,27 @@
-SOURCE_FILE@[0; 18)
-  TYPE_ALIAS_DEF@[0; 12)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    SLICE_TYPE@[9; 12)
-      L_BRACK@[9; 10) "["
-      TUPLE_TYPE@[10; 12)
-        L_PAREN@[10; 11) "("
-        R_PAREN@[11; 12) ")"
-  WHITESPACE@[12; 13) " "
-  ERROR@[13; 15)
-    INT_NUMBER@[13; 15) "92"
-  ERROR@[15; 16)
-    R_BRACK@[15; 16) "]"
-  ERROR@[16; 17)
-    SEMICOLON@[16; 17) ";"
-  WHITESPACE@[17; 18) "\n"
-error [12; 12): expected `;` or `]`
-error [12; 12): expected SEMICOLON
-error [13; 13): expected an item
-error [15; 15): expected an item
-error [16; 16): expected an item
+SOURCE_FILE@0..18
+  TYPE_ALIAS_DEF@0..12
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    SLICE_TYPE@9..12
+      L_BRACK@9..10 "["
+      TUPLE_TYPE@10..12
+        L_PAREN@10..11 "("
+        R_PAREN@11..12 ")"
+  WHITESPACE@12..13 " "
+  ERROR@13..15
+    INT_NUMBER@13..15 "92"
+  ERROR@15..16
+    R_BRACK@15..16 "]"
+  ERROR@16..17
+    SEMICOLON@16..17 ";"
+  WHITESPACE@17..18 "\n"
+error 12..12: expected `;` or `]`
+error 12..12: expected SEMICOLON
+error 13..13: expected an item
+error 15..15: expected an item
+error 16..16: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index a85855f8c..85bf276a0 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -1,29 +1,29 @@
-SOURCE_FILE@[0; 30)
-  FN_DEF@[0; 29)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 29)
-      BLOCK@[10; 29)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        EXPR_STMT@[16; 22)
-          ERROR@[16; 22)
-            LABEL@[16; 22)
-              LIFETIME@[16; 21) "\'loop"
-              COLON@[21; 22) ":"
-        WHITESPACE@[22; 23) " "
-        IMPL_DEF@[23; 27)
-          IMPL_KW@[23; 27) "impl"
-        WHITESPACE@[27; 28) "\n"
-        R_CURLY@[28; 29) "}"
-  WHITESPACE@[29; 30) "\n"
-error [22; 22): expected a loop
-error [22; 22): expected SEMICOLON
-error [27; 27): expected type
-error [27; 27): expected `{`
+SOURCE_FILE@0..30
+  FN_DEF@0..29
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..29
+      BLOCK@10..29
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        EXPR_STMT@16..22
+          ERROR@16..22
+            LABEL@16..22
+              LIFETIME@16..21 "\'loop"
+              COLON@21..22 ":"
+        WHITESPACE@22..23 " "
+        IMPL_DEF@23..27
+          IMPL_KW@23..27 "impl"
+        WHITESPACE@27..28 "\n"
+        R_CURLY@28..29 "}"
+  WHITESPACE@29..30 "\n"
+error 22..22: expected a loop
+error 22..22: expected SEMICOLON
+error 27..27: expected type
+error 27..27: expected `{`
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
index e9efad674..95bcc3c0a 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
@@ -1,17 +1,17 @@
-SOURCE_FILE@[0; 14)
-  TYPE_ALIAS_DEF@[0; 13)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    POINTER_TYPE@[9; 12)
-      STAR@[9; 10) "*"
-      TUPLE_TYPE@[10; 12)
-        L_PAREN@[10; 11) "("
-        R_PAREN@[11; 12) ")"
-    SEMICOLON@[12; 13) ";"
-  WHITESPACE@[13; 14) "\n"
-error [10; 10): expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
+SOURCE_FILE@0..14
+  TYPE_ALIAS_DEF@0..13
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    POINTER_TYPE@9..12
+      STAR@9..10 "*"
+      TUPLE_TYPE@10..12
+        L_PAREN@10..11 "("
+        R_PAREN@11..12 ")"
+    SEMICOLON@12..13 ";"
+  WHITESPACE@13..14 "\n"
+error 10..10: expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
index 124f0a891..fd939be8d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
@@ -1,79 +1,79 @@
-SOURCE_FILE@[0; 87)
-  IMPL_DEF@[0; 12)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 9)
-      PATH@[5; 9)
-        PATH_SEGMENT@[5; 9)
-          NAME_REF@[5; 9)
-            IDENT@[5; 9) "Type"
-    WHITESPACE@[9; 10) " "
-    ITEM_LIST@[10; 12)
-      L_CURLY@[10; 11) "{"
-      R_CURLY@[11; 12) "}"
-  WHITESPACE@[12; 13) "\n"
-  IMPL_DEF@[13; 33)
-    IMPL_KW@[13; 17) "impl"
-    WHITESPACE@[17; 18) " "
-    PATH_TYPE@[18; 24)
-      PATH@[18; 24)
-        PATH_SEGMENT@[18; 24)
-          NAME_REF@[18; 24)
-            IDENT@[18; 24) "Trait1"
-    WHITESPACE@[24; 25) " "
-    FOR_KW@[25; 28) "for"
-    WHITESPACE@[28; 29) " "
-    PATH_TYPE@[29; 30)
-      PATH@[29; 30)
-        PATH_SEGMENT@[29; 30)
-          NAME_REF@[29; 30)
-            IDENT@[29; 30) "T"
-    WHITESPACE@[30; 31) " "
-    ITEM_LIST@[31; 33)
-      L_CURLY@[31; 32) "{"
-      R_CURLY@[32; 33) "}"
-  WHITESPACE@[33; 34) "\n"
-  IMPL_DEF@[34; 38)
-    IMPL_KW@[34; 38) "impl"
-  WHITESPACE@[38; 39) " "
-  IMPL_DEF@[39; 54)
-    IMPL_KW@[39; 43) "impl"
-    WHITESPACE@[43; 44) " "
-    PATH_TYPE@[44; 51)
-      PATH@[44; 51)
-        PATH_SEGMENT@[44; 51)
-          NAME_REF@[44; 51)
-            IDENT@[44; 51) "NotType"
-    WHITESPACE@[51; 52) " "
-    ITEM_LIST@[52; 54)
-      L_CURLY@[52; 53) "{"
-      R_CURLY@[53; 54) "}"
-  WHITESPACE@[54; 55) "\n"
-  IMPL_DEF@[55; 70)
-    IMPL_KW@[55; 59) "impl"
-    WHITESPACE@[59; 60) " "
-    PATH_TYPE@[60; 66)
-      PATH@[60; 66)
-        PATH_SEGMENT@[60; 66)
-          NAME_REF@[60; 66)
-            IDENT@[60; 66) "Trait2"
-    WHITESPACE@[66; 67) " "
-    FOR_KW@[67; 70) "for"
-  WHITESPACE@[70; 71) " "
-  IMPL_DEF@[71; 86)
-    IMPL_KW@[71; 75) "impl"
-    WHITESPACE@[75; 76) " "
-    PATH_TYPE@[76; 83)
-      PATH@[76; 83)
-        PATH_SEGMENT@[76; 83)
-          NAME_REF@[76; 83)
-            IDENT@[76; 83) "NotType"
-    WHITESPACE@[83; 84) " "
-    ITEM_LIST@[84; 86)
-      L_CURLY@[84; 85) "{"
-      R_CURLY@[85; 86) "}"
-  WHITESPACE@[86; 87) "\n"
-error [38; 38): expected trait or type
-error [38; 38): expected `{`
-error [70; 70): expected trait or type
-error [70; 70): expected `{`
+SOURCE_FILE@0..87
+  IMPL_DEF@0..12
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..9
+      PATH@5..9
+        PATH_SEGMENT@5..9
+          NAME_REF@5..9
+            IDENT@5..9 "Type"
+    WHITESPACE@9..10 " "
+    ITEM_LIST@10..12
+      L_CURLY@10..11 "{"
+      R_CURLY@11..12 "}"
+  WHITESPACE@12..13 "\n"
+  IMPL_DEF@13..33
+    IMPL_KW@13..17 "impl"
+    WHITESPACE@17..18 " "
+    PATH_TYPE@18..24
+      PATH@18..24
+        PATH_SEGMENT@18..24
+          NAME_REF@18..24
+            IDENT@18..24 "Trait1"
+    WHITESPACE@24..25 " "
+    FOR_KW@25..28 "for"
+    WHITESPACE@28..29 " "
+    PATH_TYPE@29..30
+      PATH@29..30
+        PATH_SEGMENT@29..30
+          NAME_REF@29..30
+            IDENT@29..30 "T"
+    WHITESPACE@30..31 " "
+    ITEM_LIST@31..33
+      L_CURLY@31..32 "{"
+      R_CURLY@32..33 "}"
+  WHITESPACE@33..34 "\n"
+  IMPL_DEF@34..38
+    IMPL_KW@34..38 "impl"
+  WHITESPACE@38..39 " "
+  IMPL_DEF@39..54
+    IMPL_KW@39..43 "impl"
+    WHITESPACE@43..44 " "
+    PATH_TYPE@44..51
+      PATH@44..51
+        PATH_SEGMENT@44..51
+          NAME_REF@44..51
+            IDENT@44..51 "NotType"
+    WHITESPACE@51..52 " "
+    ITEM_LIST@52..54
+      L_CURLY@52..53 "{"
+      R_CURLY@53..54 "}"
+  WHITESPACE@54..55 "\n"
+  IMPL_DEF@55..70
+    IMPL_KW@55..59 "impl"
+    WHITESPACE@59..60 " "
+    PATH_TYPE@60..66
+      PATH@60..66
+        PATH_SEGMENT@60..66
+          NAME_REF@60..66
+            IDENT@60..66 "Trait2"
+    WHITESPACE@66..67 " "
+    FOR_KW@67..70 "for"
+  WHITESPACE@70..71 " "
+  IMPL_DEF@71..86
+    IMPL_KW@71..75 "impl"
+    WHITESPACE@75..76 " "
+    PATH_TYPE@76..83
+      PATH@76..83
+        PATH_SEGMENT@76..83
+          NAME_REF@76..83
+            IDENT@76..83 "NotType"
+    WHITESPACE@83..84 " "
+    ITEM_LIST@84..86
+      L_CURLY@84..85 "{"
+      R_CURLY@85..86 "}"
+  WHITESPACE@86..87 "\n"
+error 38..38: expected trait or type
+error 38..38: expected `{`
+error 70..70: expected trait or type
+error 70..70: expected `{`
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
index b8a494085..90202d764 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
@@ -1,23 +1,23 @@
-SOURCE_FILE@[0; 20)
-  TYPE_ALIAS_DEF@[0; 15)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "F"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    UNSAFE_KW@[9; 15) "unsafe"
-  WHITESPACE@[15; 16) " "
-  ERROR@[16; 17)
-    L_PAREN@[16; 17) "("
-  ERROR@[17; 18)
-    R_PAREN@[17; 18) ")"
-  ERROR@[18; 19)
-    SEMICOLON@[18; 19) ";"
-  WHITESPACE@[19; 20) "\n"
-error [15; 15): expected `fn`
-error [15; 15): expected SEMICOLON
-error [16; 16): expected an item
-error [17; 17): expected an item
-error [18; 18): expected an item
+SOURCE_FILE@0..20
+  TYPE_ALIAS_DEF@0..15
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "F"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    UNSAFE_KW@9..15 "unsafe"
+  WHITESPACE@15..16 " "
+  ERROR@16..17
+    L_PAREN@16..17 "("
+  ERROR@17..18
+    R_PAREN@17..18 ")"
+  ERROR@18..19
+    SEMICOLON@18..19 ";"
+  WHITESPACE@19..20 "\n"
+error 15..15: expected `fn`
+error 15..15: expected SEMICOLON
+error 16..16: expected an item
+error 17..17: expected an item
+error 18..18: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
index 690acdca3..b901c17f7 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
@@ -1,37 +1,37 @@
-SOURCE_FILE@[0; 33)
-  FN_DEF@[0; 10)
-    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) ")"
-    BLOCK_EXPR@[8; 10)
-      BLOCK@[8; 10)
-        L_CURLY@[8; 9) "{"
-        R_CURLY@[9; 10) "}"
-  WHITESPACE@[10; 11) " "
-  ERROR@[11; 17)
-    UNSAFE_KW@[11; 17) "unsafe"
-  WHITESPACE@[17; 18) " "
-  ERROR@[18; 21)
-    L_CURLY@[18; 19) "{"
-    WHITESPACE@[19; 20) " "
-    R_CURLY@[20; 21) "}"
-  WHITESPACE@[21; 22) " "
-  FN_DEF@[22; 32)
-    FN_KW@[22; 24) "fn"
-    WHITESPACE@[24; 25) " "
-    NAME@[25; 28)
-      IDENT@[25; 28) "bar"
-    PARAM_LIST@[28; 30)
-      L_PAREN@[28; 29) "("
-      R_PAREN@[29; 30) ")"
-    BLOCK_EXPR@[30; 32)
-      BLOCK@[30; 32)
-        L_CURLY@[30; 31) "{"
-        R_CURLY@[31; 32) "}"
-  WHITESPACE@[32; 33) "\n"
-error [11; 11): expected an item
-error [18; 18): expected an item
+SOURCE_FILE@0..33
+  FN_DEF@0..10
+    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 ")"
+    BLOCK_EXPR@8..10
+      BLOCK@8..10
+        L_CURLY@8..9 "{"
+        R_CURLY@9..10 "}"
+  WHITESPACE@10..11 " "
+  ERROR@11..17
+    UNSAFE_KW@11..17 "unsafe"
+  WHITESPACE@17..18 " "
+  ERROR@18..21
+    L_CURLY@18..19 "{"
+    WHITESPACE@19..20 " "
+    R_CURLY@20..21 "}"
+  WHITESPACE@21..22 " "
+  FN_DEF@22..32
+    FN_KW@22..24 "fn"
+    WHITESPACE@24..25 " "
+    NAME@25..28
+      IDENT@25..28 "bar"
+    PARAM_LIST@28..30
+      L_PAREN@28..29 "("
+      R_PAREN@29..30 ")"
+    BLOCK_EXPR@30..32
+      BLOCK@30..32
+        L_CURLY@30..31 "{"
+        R_CURLY@31..32 "}"
+  WHITESPACE@32..33 "\n"
+error 11..11: expected an item
+error 18..18: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index c3f7eb477..3f48b86ed 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
@@ -1,32 +1,32 @@
-SOURCE_FILE@[0; 30)
-  FN_DEF@[0; 29)
-    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; 29)
-      BLOCK@[9; 29)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) " "
-        LET_STMT@[11; 27)
-          LET_KW@[11; 14) "let"
-          WHITESPACE@[14; 15) " "
-          PLACEHOLDER_PAT@[15; 16)
-            UNDERSCORE@[15; 16) "_"
-          WHITESPACE@[16; 17) " "
-          EQ@[17; 18) "="
-          WHITESPACE@[18; 19) " "
-          BLOCK_EXPR@[19; 27)
-            ASYNC_KW@[19; 24) "async"
-            WHITESPACE@[24; 25) " "
-            BLOCK@[25; 27)
-              L_CURLY@[25; 26) "{"
-              R_CURLY@[26; 27) "}"
-        WHITESPACE@[27; 28) " "
-        R_CURLY@[28; 29) "}"
-  WHITESPACE@[29; 30) "\n"
-error [27; 27): expected SEMICOLON
+SOURCE_FILE@0..30
+  FN_DEF@0..29
+    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..29
+      BLOCK@9..29
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 " "
+        LET_STMT@11..27
+          LET_KW@11..14 "let"
+          WHITESPACE@14..15 " "
+          PLACEHOLDER_PAT@15..16
+            UNDERSCORE@15..16 "_"
+          WHITESPACE@16..17 " "
+          EQ@17..18 "="
+          WHITESPACE@18..19 " "
+          BLOCK_EXPR@19..27
+            ASYNC_KW@19..24 "async"
+            WHITESPACE@24..25 " "
+            BLOCK@25..27
+              L_CURLY@25..26 "{"
+              R_CURLY@26..27 "}"
+        WHITESPACE@27..28 " "
+        R_CURLY@28..29 "}"
+  WHITESPACE@29..30 "\n"
+error 27..27: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
index a345f8488..be02eaeeb 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
@@ -1,26 +1,26 @@
-SOURCE_FILE@[0; 21)
-  FN_DEF@[0; 20)
-    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; 20)
-      BLOCK@[9; 20)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) " "
-        ERROR@[11; 14)
-          VISIBILITY@[11; 14)
-            PUB_KW@[11; 14) "pub"
-        WHITESPACE@[14; 15) " "
-        EXPR_STMT@[15; 18)
-          LITERAL@[15; 17)
-            INT_NUMBER@[15; 17) "92"
-          SEMICOLON@[17; 18) ";"
-        WHITESPACE@[18; 19) " "
-        R_CURLY@[19; 20) "}"
-  WHITESPACE@[20; 21) "\n"
-error [14; 14): expected an item
+SOURCE_FILE@0..21
+  FN_DEF@0..20
+    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..20
+      BLOCK@9..20
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 " "
+        ERROR@11..14
+          VISIBILITY@11..14
+            PUB_KW@11..14 "pub"
+        WHITESPACE@14..15 " "
+        EXPR_STMT@15..18
+          LITERAL@15..17
+            INT_NUMBER@15..17 "92"
+          SEMICOLON@17..18 ";"
+        WHITESPACE@18..19 " "
+        R_CURLY@19..20 "}"
+  WHITESPACE@20..21 "\n"
+error 14..14: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index c3a70147a..b344e4f7f 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -1,61 +1,61 @@
-SOURCE_FILE@[0; 48)
-  FN_DEF@[0; 47)
-    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; 47)
-      BLOCK@[9; 47)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 14) "\n   "
-        EXPR_STMT@[14; 25)
-          ATTR@[14; 18)
-            POUND@[14; 15) "#"
-            L_BRACK@[15; 16) "["
-            PATH@[16; 17)
-              PATH_SEGMENT@[16; 17)
-                NAME_REF@[16; 17)
-                  IDENT@[16; 17) "A"
-            R_BRACK@[17; 18) "]"
-          WHITESPACE@[18; 19) " "
-          BIN_EXPR@[19; 24)
-            LITERAL@[19; 20)
-              INT_NUMBER@[19; 20) "1"
-            WHITESPACE@[20; 21) " "
-            PLUS@[21; 22) "+"
-            WHITESPACE@[22; 23) " "
-            LITERAL@[23; 24)
-              INT_NUMBER@[23; 24) "2"
-          SEMICOLON@[24; 25) ";"
-        WHITESPACE@[25; 29) "\n   "
-        EXPR_STMT@[29; 45)
-          ATTR@[29; 33)
-            POUND@[29; 30) "#"
-            L_BRACK@[30; 31) "["
-            PATH@[31; 32)
-              PATH_SEGMENT@[31; 32)
-                NAME_REF@[31; 32)
-                  IDENT@[31; 32) "B"
-            R_BRACK@[32; 33) "]"
-          WHITESPACE@[33; 34) " "
-          IF_EXPR@[34; 44)
-            IF_KW@[34; 36) "if"
-            WHITESPACE@[36; 37) " "
-            CONDITION@[37; 41)
-              LITERAL@[37; 41)
-                TRUE_KW@[37; 41) "true"
-            WHITESPACE@[41; 42) " "
-            BLOCK_EXPR@[42; 44)
-              BLOCK@[42; 44)
-                L_CURLY@[42; 43) "{"
-                R_CURLY@[43; 44) "}"
-          SEMICOLON@[44; 45) ";"
-        WHITESPACE@[45; 46) "\n"
-        R_CURLY@[46; 47) "}"
-  WHITESPACE@[47; 48) "\n"
-error [24; 24): attributes are not allowed on BIN_EXPR
-error [44; 44): attributes are not allowed on IF_EXPR
+SOURCE_FILE@0..48
+  FN_DEF@0..47
+    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..47
+      BLOCK@9..47
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..14 "\n   "
+        EXPR_STMT@14..25
+          ATTR@14..18
+            POUND@14..15 "#"
+            L_BRACK@15..16 "["
+            PATH@16..17
+              PATH_SEGMENT@16..17
+                NAME_REF@16..17
+                  IDENT@16..17 "A"
+            R_BRACK@17..18 "]"
+          WHITESPACE@18..19 " "
+          BIN_EXPR@19..24
+            LITERAL@19..20
+              INT_NUMBER@19..20 "1"
+            WHITESPACE@20..21 " "
+            PLUS@21..22 "+"
+            WHITESPACE@22..23 " "
+            LITERAL@23..24
+              INT_NUMBER@23..24 "2"
+          SEMICOLON@24..25 ";"
+        WHITESPACE@25..29 "\n   "
+        EXPR_STMT@29..45
+          ATTR@29..33
+            POUND@29..30 "#"
+            L_BRACK@30..31 "["
+            PATH@31..32
+              PATH_SEGMENT@31..32
+                NAME_REF@31..32
+                  IDENT@31..32 "B"
+            R_BRACK@32..33 "]"
+          WHITESPACE@33..34 " "
+          IF_EXPR@34..44
+            IF_KW@34..36 "if"
+            WHITESPACE@36..37 " "
+            CONDITION@37..41
+              LITERAL@37..41
+                TRUE_KW@37..41 "true"
+            WHITESPACE@41..42 " "
+            BLOCK_EXPR@42..44
+              BLOCK@42..44
+                L_CURLY@42..43 "{"
+                R_CURLY@43..44 "}"
+          SEMICOLON@44..45 ";"
+        WHITESPACE@45..46 "\n"
+        R_CURLY@46..47 "}"
+  WHITESPACE@47..48 "\n"
+error 24..24: attributes are not allowed on BIN_EXPR
+error 44..44: attributes are not allowed on IF_EXPR
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index 61d737abe..5339a84d7 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
@@ -1,53 +1,53 @@
-SOURCE_FILE@[0; 47)
-  FN_DEF@[0; 46)
-    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; 46)
-      BLOCK@[9; 46)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 20)
-          FIELD_EXPR@[15; 19)
-            PATH_EXPR@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "x"
-            DOT@[16; 17) "."
-            FLOAT_NUMBER@[17; 19) "0."
-          SEMICOLON@[19; 20) ";"
-        WHITESPACE@[20; 25) "\n    "
-        EXPR_STMT@[25; 32)
-          FIELD_EXPR@[25; 31)
-            PATH_EXPR@[25; 26)
-              PATH@[25; 26)
-                PATH_SEGMENT@[25; 26)
-                  NAME_REF@[25; 26)
-                    IDENT@[25; 26) "x"
-            DOT@[26; 27) "."
-            NAME_REF@[27; 31)
-              INT_NUMBER@[27; 31) "1i32"
-          SEMICOLON@[31; 32) ";"
-        WHITESPACE@[32; 37) "\n    "
-        EXPR_STMT@[37; 44)
-          FIELD_EXPR@[37; 43)
-            PATH_EXPR@[37; 38)
-              PATH@[37; 38)
-                PATH_SEGMENT@[37; 38)
-                  NAME_REF@[37; 38)
-                    IDENT@[37; 38) "x"
-            DOT@[38; 39) "."
-            NAME_REF@[39; 43)
-              INT_NUMBER@[39; 43) "0x01"
-          SEMICOLON@[43; 44) ";"
-        WHITESPACE@[44; 45) "\n"
-        R_CURLY@[45; 46) "}"
-  WHITESPACE@[46; 47) "\n"
-error [27; 31): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
-error [39; 43): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
+SOURCE_FILE@0..47
+  FN_DEF@0..46
+    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..46
+      BLOCK@9..46
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..20
+          FIELD_EXPR@15..19
+            PATH_EXPR@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "x"
+            DOT@16..17 "."
+            FLOAT_NUMBER@17..19 "0."
+          SEMICOLON@19..20 ";"
+        WHITESPACE@20..25 "\n    "
+        EXPR_STMT@25..32
+          FIELD_EXPR@25..31
+            PATH_EXPR@25..26
+              PATH@25..26
+                PATH_SEGMENT@25..26
+                  NAME_REF@25..26
+                    IDENT@25..26 "x"
+            DOT@26..27 "."
+            NAME_REF@27..31
+              INT_NUMBER@27..31 "1i32"
+          SEMICOLON@31..32 ";"
+        WHITESPACE@32..37 "\n    "
+        EXPR_STMT@37..44
+          FIELD_EXPR@37..43
+            PATH_EXPR@37..38
+              PATH@37..38
+                PATH_SEGMENT@37..38
+                  NAME_REF@37..38
+                    IDENT@37..38 "x"
+            DOT@38..39 "."
+            NAME_REF@39..43
+              INT_NUMBER@39..43 "0x01"
+          SEMICOLON@43..44 ";"
+        WHITESPACE@44..45 "\n"
+        R_CURLY@45..46 "}"
+  WHITESPACE@46..47 "\n"
+error 27..31: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
+error 39..43: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index f6ac0feaf..20ed39046 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -1,41 +1,41 @@
-SOURCE_FILE@[0; 50)
-  ERROR@[0; 6)
-    UNSAFE_KW@[0; 6) "unsafe"
-  WHITESPACE@[6; 7) " "
-  FN_DEF@[7; 24)
-    ASYNC_KW@[7; 12) "async"
-    WHITESPACE@[12; 13) " "
-    FN_KW@[13; 15) "fn"
-    WHITESPACE@[15; 16) " "
-    NAME@[16; 19)
-      IDENT@[16; 19) "foo"
-    PARAM_LIST@[19; 21)
-      L_PAREN@[19; 20) "("
-      R_PAREN@[20; 21) ")"
-    WHITESPACE@[21; 22) " "
-    BLOCK_EXPR@[22; 24)
-      BLOCK@[22; 24)
-        L_CURLY@[22; 23) "{"
-        R_CURLY@[23; 24) "}"
-  WHITESPACE@[24; 25) "\n"
-  ERROR@[25; 31)
-    UNSAFE_KW@[25; 31) "unsafe"
-  WHITESPACE@[31; 32) " "
-  FN_DEF@[32; 49)
-    CONST_KW@[32; 37) "const"
-    WHITESPACE@[37; 38) " "
-    FN_KW@[38; 40) "fn"
-    WHITESPACE@[40; 41) " "
-    NAME@[41; 44)
-      IDENT@[41; 44) "bar"
-    PARAM_LIST@[44; 46)
-      L_PAREN@[44; 45) "("
-      R_PAREN@[45; 46) ")"
-    WHITESPACE@[46; 47) " "
-    BLOCK_EXPR@[47; 49)
-      BLOCK@[47; 49)
-        L_CURLY@[47; 48) "{"
-        R_CURLY@[48; 49) "}"
-  WHITESPACE@[49; 50) "\n"
-error [6; 6): expected existential, fn, trait or impl
-error [31; 31): expected existential, fn, trait or impl
+SOURCE_FILE@0..50
+  ERROR@0..6
+    UNSAFE_KW@0..6 "unsafe"
+  WHITESPACE@6..7 " "
+  FN_DEF@7..24
+    ASYNC_KW@7..12 "async"
+    WHITESPACE@12..13 " "
+    FN_KW@13..15 "fn"
+    WHITESPACE@15..16 " "
+    NAME@16..19
+      IDENT@16..19 "foo"
+    PARAM_LIST@19..21
+      L_PAREN@19..20 "("
+      R_PAREN@20..21 ")"
+    WHITESPACE@21..22 " "
+    BLOCK_EXPR@22..24
+      BLOCK@22..24
+        L_CURLY@22..23 "{"
+        R_CURLY@23..24 "}"
+  WHITESPACE@24..25 "\n"
+  ERROR@25..31
+    UNSAFE_KW@25..31 "unsafe"
+  WHITESPACE@31..32 " "
+  FN_DEF@32..49
+    CONST_KW@32..37 "const"
+    WHITESPACE@37..38 " "
+    FN_KW@38..40 "fn"
+    WHITESPACE@40..41 " "
+    NAME@41..44
+      IDENT@41..44 "bar"
+    PARAM_LIST@44..46
+      L_PAREN@44..45 "("
+      R_PAREN@45..46 ")"
+    WHITESPACE@46..47 " "
+    BLOCK_EXPR@47..49
+      BLOCK@47..49
+        L_CURLY@47..48 "{"
+        R_CURLY@48..49 "}"
+  WHITESPACE@49..50 "\n"
+error 6..6: expected existential, fn, trait or impl
+error 31..31: expected existential, fn, trait or impl
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
index 62fca0a39..ebcc26e0d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
@@ -1,21 +1,21 @@
-SOURCE_FILE@[0; 19)
-  STATIC_DEF@[0; 18)
-    STATIC_KW@[0; 6) "static"
-    WHITESPACE@[6; 7) " "
-    ERROR@[7; 8)
-      UNDERSCORE@[7; 8) "_"
-    COLON@[8; 9) ":"
-    WHITESPACE@[9; 10) " "
-    PATH_TYPE@[10; 13)
-      PATH@[10; 13)
-        PATH_SEGMENT@[10; 13)
-          NAME_REF@[10; 13)
-            IDENT@[10; 13) "i32"
-    WHITESPACE@[13; 14) " "
-    EQ@[14; 15) "="
-    WHITESPACE@[15; 16) " "
-    LITERAL@[16; 17)
-      INT_NUMBER@[16; 17) "5"
-    SEMICOLON@[17; 18) ";"
-  WHITESPACE@[18; 19) "\n"
-error [7; 7): expected a name
+SOURCE_FILE@0..19
+  STATIC_DEF@0..18
+    STATIC_KW@0..6 "static"
+    WHITESPACE@6..7 " "
+    ERROR@7..8
+      UNDERSCORE@7..8 "_"
+    COLON@8..9 ":"
+    WHITESPACE@9..10 " "
+    PATH_TYPE@10..13
+      PATH@10..13
+        PATH_SEGMENT@10..13
+          NAME_REF@10..13
+            IDENT@10..13 "i32"
+    WHITESPACE@13..14 " "
+    EQ@14..15 "="
+    WHITESPACE@15..16 " "
+    LITERAL@16..17
+      INT_NUMBER@16..17 "5"
+    SEMICOLON@17..18 ";"
+  WHITESPACE@18..19 "\n"
+error 7..7: expected a name
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index aa960d3ef..88567263e 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -1,59 +1,59 @@
-SOURCE_FILE@[0; 62)
-  TRAIT_DEF@[0; 61)
-    TRAIT_KW@[0; 5) "trait"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 7)
-      IDENT@[6; 7) "T"
-    WHITESPACE@[7; 8) " "
-    ITEM_LIST@[8; 61)
-      L_CURLY@[8; 9) "{"
-      WHITESPACE@[9; 14) "\n    "
-      MACRO_CALL@[14; 21)
-        PATH@[14; 21)
-          PATH_SEGMENT@[14; 21)
-            NAME_REF@[14; 21)
-              IDENT@[14; 21) "default"
-      WHITESPACE@[21; 22) " "
-      TYPE_ALIAS_DEF@[22; 35)
-        TYPE_KW@[22; 26) "type"
-        WHITESPACE@[26; 27) " "
-        NAME@[27; 28)
-          IDENT@[27; 28) "T"
-        WHITESPACE@[28; 29) " "
-        EQ@[29; 30) "="
-        WHITESPACE@[30; 31) " "
-        PATH_TYPE@[31; 34)
-          PATH@[31; 34)
-            PATH_SEGMENT@[31; 34)
-              NAME_REF@[31; 34)
-                IDENT@[31; 34) "Bar"
-        SEMICOLON@[34; 35) ";"
-      WHITESPACE@[35; 40) "\n    "
-      MACRO_CALL@[40; 47)
-        PATH@[40; 47)
-          PATH_SEGMENT@[40; 47)
-            NAME_REF@[40; 47)
-              IDENT@[40; 47) "default"
-      WHITESPACE@[47; 48) " "
-      FN_DEF@[48; 59)
-        FN_KW@[48; 50) "fn"
-        WHITESPACE@[50; 51) " "
-        NAME@[51; 54)
-          IDENT@[51; 54) "foo"
-        PARAM_LIST@[54; 56)
-          L_PAREN@[54; 55) "("
-          R_PAREN@[55; 56) ")"
-        WHITESPACE@[56; 57) " "
-        BLOCK_EXPR@[57; 59)
-          BLOCK@[57; 59)
-            L_CURLY@[57; 58) "{"
-            R_CURLY@[58; 59) "}"
-      WHITESPACE@[59; 60) "\n"
-      R_CURLY@[60; 61) "}"
-  WHITESPACE@[61; 62) "\n"
-error [21; 21): expected BANG
-error [21; 21): expected `{`, `[`, `(`
-error [21; 21): expected SEMICOLON
-error [47; 47): expected BANG
-error [47; 47): expected `{`, `[`, `(`
-error [47; 47): expected SEMICOLON
+SOURCE_FILE@0..62
+  TRAIT_DEF@0..61
+    TRAIT_KW@0..5 "trait"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "T"
+    WHITESPACE@7..8 " "
+    ITEM_LIST@8..61
+      L_CURLY@8..9 "{"
+      WHITESPACE@9..14 "\n    "
+      MACRO_CALL@14..21
+        PATH@14..21
+          PATH_SEGMENT@14..21
+            NAME_REF@14..21
+              IDENT@14..21 "default"
+      WHITESPACE@21..22 " "
+      TYPE_ALIAS_DEF@22..35
+        TYPE_KW@22..26 "type"
+        WHITESPACE@26..27 " "
+        NAME@27..28
+          IDENT@27..28 "T"
+        WHITESPACE@28..29 " "
+        EQ@29..30 "="
+        WHITESPACE@30..31 " "
+        PATH_TYPE@31..34
+          PATH@31..34
+            PATH_SEGMENT@31..34
+              NAME_REF@31..34
+                IDENT@31..34 "Bar"
+        SEMICOLON@34..35 ";"
+      WHITESPACE@35..40 "\n    "
+      MACRO_CALL@40..47
+        PATH@40..47
+          PATH_SEGMENT@40..47
+            NAME_REF@40..47
+              IDENT@40..47 "default"
+      WHITESPACE@47..48 " "
+      FN_DEF@48..59
+        FN_KW@48..50 "fn"
+        WHITESPACE@50..51 " "
+        NAME@51..54
+          IDENT@51..54 "foo"
+        PARAM_LIST@54..56
+          L_PAREN@54..55 "("
+          R_PAREN@55..56 ")"
+        WHITESPACE@56..57 " "
+        BLOCK_EXPR@57..59
+          BLOCK@57..59
+            L_CURLY@57..58 "{"
+            R_CURLY@58..59 "}"
+      WHITESPACE@59..60 "\n"
+      R_CURLY@60..61 "}"
+  WHITESPACE@61..62 "\n"
+error 21..21: expected BANG
+error 21..21: expected `{`, `[`, `(`
+error 21..21: expected SEMICOLON
+error 47..47: expected BANG
+error 47..47: expected `{`, `[`, `(`
+error 47..47: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
index 75043c9c0..578befa56 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
@@ -1,49 +1,49 @@
-SOURCE_FILE@[0; 45)
-  FN_DEF@[0; 44)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 44)
-      BLOCK@[10; 44)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        RECORD_LIT@[16; 42)
-          PATH@[16; 17)
-            PATH_SEGMENT@[16; 17)
-              NAME_REF@[16; 17)
-                IDENT@[16; 17) "S"
-          WHITESPACE@[17; 18) " "
-          RECORD_FIELD_LIST@[18; 42)
-            L_CURLY@[18; 19) "{"
-            WHITESPACE@[19; 20) " "
-            RECORD_FIELD@[20; 40)
-              NAME_REF@[20; 25)
-                IDENT@[20; 25) "field"
-              WHITESPACE@[25; 26) " "
-              RANGE_EXPR@[26; 40)
-                DOT2@[26; 28) ".."
-                CALL_EXPR@[28; 40)
-                  PATH_EXPR@[28; 38)
-                    PATH@[28; 38)
-                      PATH@[28; 29)
-                        PATH_SEGMENT@[28; 29)
-                          NAME_REF@[28; 29)
-                            IDENT@[28; 29) "S"
-                      COLON2@[29; 31) "::"
-                      PATH_SEGMENT@[31; 38)
-                        NAME_REF@[31; 38)
-                          IDENT@[31; 38) "default"
-                  ARG_LIST@[38; 40)
-                    L_PAREN@[38; 39) "("
-                    R_PAREN@[39; 40) ")"
-            WHITESPACE@[40; 41) " "
-            R_CURLY@[41; 42) "}"
-        WHITESPACE@[42; 43) "\n"
-        R_CURLY@[43; 44) "}"
-  WHITESPACE@[44; 45) "\n"
-error [25; 25): expected COLON
+SOURCE_FILE@0..45
+  FN_DEF@0..44
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..44
+      BLOCK@10..44
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        RECORD_LIT@16..42
+          PATH@16..17
+            PATH_SEGMENT@16..17
+              NAME_REF@16..17
+                IDENT@16..17 "S"
+          WHITESPACE@17..18 " "
+          RECORD_FIELD_LIST@18..42
+            L_CURLY@18..19 "{"
+            WHITESPACE@19..20 " "
+            RECORD_FIELD@20..40
+              NAME_REF@20..25
+                IDENT@20..25 "field"
+              WHITESPACE@25..26 " "
+              RANGE_EXPR@26..40
+                DOT2@26..28 ".."
+                CALL_EXPR@28..40
+                  PATH_EXPR@28..38
+                    PATH@28..38
+                      PATH@28..29
+                        PATH_SEGMENT@28..29
+                          NAME_REF@28..29
+                            IDENT@28..29 "S"
+                      COLON2@29..31 "::"
+                      PATH_SEGMENT@31..38
+                        NAME_REF@31..38
+                          IDENT@31..38 "default"
+                  ARG_LIST@38..40
+                    L_PAREN@38..39 "("
+                    R_PAREN@39..40 ")"
+            WHITESPACE@40..41 " "
+            R_CURLY@41..42 "}"
+        WHITESPACE@42..43 "\n"
+        R_CURLY@43..44 "}"
+  WHITESPACE@44..45 "\n"
+error 25..25: expected COLON
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index 25c6ef7e3..a1fabb557 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -1,72 +1,72 @@
-SOURCE_FILE@[0; 83)
-  IMPL_DEF@[0; 82)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 6)
-      PATH@[5; 6)
-        PATH_SEGMENT@[5; 6)
-          NAME_REF@[5; 6)
-            IDENT@[5; 6) "F"
-    WHITESPACE@[6; 7) " "
-    ITEM_LIST@[7; 82)
-      L_CURLY@[7; 8) "{"
-      WHITESPACE@[8; 13) "\n    "
-      TYPE_ALIAS_DEF@[13; 27)
-        TYPE_KW@[13; 17) "type"
-        WHITESPACE@[17; 18) " "
-        NAME@[18; 19)
-          IDENT@[18; 19) "A"
-        COLON@[19; 20) ":"
-        WHITESPACE@[20; 21) " "
-        TYPE_BOUND_LIST@[21; 26)
-          TYPE_BOUND@[21; 26)
-            PATH_TYPE@[21; 26)
-              PATH@[21; 26)
-                PATH_SEGMENT@[21; 26)
-                  NAME_REF@[21; 26)
-                    IDENT@[21; 26) "Clone"
-        SEMICOLON@[26; 27) ";"
-      WHITESPACE@[27; 32) "\n    "
-      CONST_DEF@[32; 45)
-        CONST_KW@[32; 37) "const"
-        WHITESPACE@[37; 38) " "
-        NAME@[38; 39)
-          IDENT@[38; 39) "B"
-        COLON@[39; 40) ":"
-        WHITESPACE@[40; 41) " "
-        PATH_TYPE@[41; 44)
-          PATH@[41; 44)
-            PATH_SEGMENT@[41; 44)
-              NAME_REF@[41; 44)
-                IDENT@[41; 44) "i32"
-        SEMICOLON@[44; 45) ";"
-      WHITESPACE@[45; 50) "\n    "
-      FN_DEF@[50; 61)
-        FN_KW@[50; 52) "fn"
-        WHITESPACE@[52; 53) " "
-        NAME@[53; 56)
-          IDENT@[53; 56) "foo"
-        PARAM_LIST@[56; 58)
-          L_PAREN@[56; 57) "("
-          R_PAREN@[57; 58) ")"
-        WHITESPACE@[58; 59) " "
-        BLOCK_EXPR@[59; 61)
-          BLOCK@[59; 61)
-            L_CURLY@[59; 60) "{"
-            R_CURLY@[60; 61) "}"
-      WHITESPACE@[61; 66) "\n    "
-      FN_DEF@[66; 80)
-        FN_KW@[66; 68) "fn"
-        WHITESPACE@[68; 69) " "
-        NAME@[69; 72)
-          IDENT@[69; 72) "bar"
-        PARAM_LIST@[72; 79)
-          L_PAREN@[72; 73) "("
-          SELF_PARAM@[73; 78)
-            AMP@[73; 74) "&"
-            SELF_KW@[74; 78) "self"
-          R_PAREN@[78; 79) ")"
-        SEMICOLON@[79; 80) ";"
-      WHITESPACE@[80; 81) "\n"
-      R_CURLY@[81; 82) "}"
-  WHITESPACE@[82; 83) "\n"
+SOURCE_FILE@0..83
+  IMPL_DEF@0..82
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..6
+      PATH@5..6
+        PATH_SEGMENT@5..6
+          NAME_REF@5..6
+            IDENT@5..6 "F"
+    WHITESPACE@6..7 " "
+    ITEM_LIST@7..82
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..13 "\n    "
+      TYPE_ALIAS_DEF@13..27
+        TYPE_KW@13..17 "type"
+        WHITESPACE@17..18 " "
+        NAME@18..19
+          IDENT@18..19 "A"
+        COLON@19..20 ":"
+        WHITESPACE@20..21 " "
+        TYPE_BOUND_LIST@21..26
+          TYPE_BOUND@21..26
+            PATH_TYPE@21..26
+              PATH@21..26
+                PATH_SEGMENT@21..26
+                  NAME_REF@21..26
+                    IDENT@21..26 "Clone"
+        SEMICOLON@26..27 ";"
+      WHITESPACE@27..32 "\n    "
+      CONST_DEF@32..45
+        CONST_KW@32..37 "const"
+        WHITESPACE@37..38 " "
+        NAME@38..39
+          IDENT@38..39 "B"
+        COLON@39..40 ":"
+        WHITESPACE@40..41 " "
+        PATH_TYPE@41..44
+          PATH@41..44
+            PATH_SEGMENT@41..44
+              NAME_REF@41..44
+                IDENT@41..44 "i32"
+        SEMICOLON@44..45 ";"
+      WHITESPACE@45..50 "\n    "
+      FN_DEF@50..61
+        FN_KW@50..52 "fn"
+        WHITESPACE@52..53 " "
+        NAME@53..56
+          IDENT@53..56 "foo"
+        PARAM_LIST@56..58
+          L_PAREN@56..57 "("
+          R_PAREN@57..58 ")"
+        WHITESPACE@58..59 " "
+        BLOCK_EXPR@59..61
+          BLOCK@59..61
+            L_CURLY@59..60 "{"
+            R_CURLY@60..61 "}"
+      WHITESPACE@61..66 "\n    "
+      FN_DEF@66..80
+        FN_KW@66..68 "fn"
+        WHITESPACE@68..69 " "
+        NAME@69..72
+          IDENT@69..72 "bar"
+        PARAM_LIST@72..79
+          L_PAREN@72..73 "("
+          SELF_PARAM@73..78
+            AMP@73..74 "&"
+            SELF_KW@74..78 "self"
+          R_PAREN@78..79 ")"
+        SEMICOLON@79..80 ";"
+      WHITESPACE@80..81 "\n"
+      R_CURLY@81..82 "}"
+  WHITESPACE@82..83 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index 69c459daf..bd74b44a6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -1,135 +1,135 @@
-SOURCE_FILE@[0; 250)
-  USE_ITEM@[0; 58)
-    USE_KW@[0; 3) "use"
-    WHITESPACE@[3; 4) " "
-    USE_TREE@[4; 57)
-      USE_TREE_LIST@[4; 57)
-        L_CURLY@[4; 5) "{"
-        USE_TREE@[5; 28)
-          PATH@[5; 28)
-            PATH@[5; 22)
-              PATH@[5; 16)
-                PATH@[5; 10)
-                  PATH_SEGMENT@[5; 10)
-                    CRATE_KW@[5; 10) "crate"
-                COLON2@[10; 12) "::"
-                PATH_SEGMENT@[12; 16)
-                  NAME_REF@[12; 16)
-                    IDENT@[12; 16) "path"
-              COLON2@[16; 18) "::"
-              PATH_SEGMENT@[18; 22)
-                NAME_REF@[18; 22)
-                  IDENT@[18; 22) "from"
-            COLON2@[22; 24) "::"
-            PATH_SEGMENT@[24; 28)
-              NAME_REF@[24; 28)
-                IDENT@[24; 28) "root"
-        COMMA@[28; 29) ","
-        WHITESPACE@[29; 30) " "
-        USE_TREE@[30; 56)
-          PATH@[30; 56)
-            PATH@[30; 44)
-              PATH@[30; 38)
-                PATH@[30; 32)
-                  PATH_SEGMENT@[30; 32)
-                    NAME_REF@[30; 32)
-                      IDENT@[30; 32) "or"
-                COLON2@[32; 34) "::"
-                PATH_SEGMENT@[34; 38)
-                  NAME_REF@[34; 38)
-                    IDENT@[34; 38) "path"
-              COLON2@[38; 40) "::"
-              PATH_SEGMENT@[40; 44)
-                NAME_REF@[40; 44)
-                  IDENT@[40; 44) "from"
-            COLON2@[44; 46) "::"
-            PATH_SEGMENT@[46; 56)
-              NAME_REF@[46; 56)
-                IDENT@[46; 56) "crate_name"
-        R_CURLY@[56; 57) "}"
-    SEMICOLON@[57; 58) ";"
-  WHITESPACE@[58; 59) " "
-  COMMENT@[59; 97) "// Rust 2018 (with a  ..."
-  WHITESPACE@[97; 98) "\n"
-  USE_ITEM@[98; 121)
-    USE_KW@[98; 101) "use"
-    WHITESPACE@[101; 102) " "
-    USE_TREE@[102; 120)
-      USE_TREE_LIST@[102; 120)
-        L_CURLY@[102; 103) "{"
-        USE_TREE@[103; 119)
-          PATH@[103; 119)
-            PATH@[103; 113)
-              PATH@[103; 107)
-                PATH_SEGMENT@[103; 107)
-                  NAME_REF@[103; 107)
-                    IDENT@[103; 107) "path"
-              COLON2@[107; 109) "::"
-              PATH_SEGMENT@[109; 113)
-                NAME_REF@[109; 113)
-                  IDENT@[109; 113) "from"
-            COLON2@[113; 115) "::"
-            PATH_SEGMENT@[115; 119)
-              NAME_REF@[115; 119)
-                IDENT@[115; 119) "root"
-        R_CURLY@[119; 120) "}"
-    SEMICOLON@[120; 121) ";"
-  WHITESPACE@[121; 122) " "
-  COMMENT@[122; 134) "// Rust 2015"
-  WHITESPACE@[134; 135) "\n"
-  USE_ITEM@[135; 166)
-    USE_KW@[135; 138) "use"
-    WHITESPACE@[138; 139) " "
-    USE_TREE@[139; 165)
-      COLON2@[139; 141) "::"
-      USE_TREE_LIST@[141; 165)
-        L_CURLY@[141; 142) "{"
-        USE_TREE@[142; 164)
-          PATH@[142; 164)
-            PATH@[142; 158)
-              PATH@[142; 146)
-                PATH_SEGMENT@[142; 146)
-                  NAME_REF@[142; 146)
-                    IDENT@[142; 146) "some"
-              COLON2@[146; 148) "::"
-              PATH_SEGMENT@[148; 158)
-                NAME_REF@[148; 158)
-                  IDENT@[148; 158) "arbritrary"
-            COLON2@[158; 160) "::"
-            PATH_SEGMENT@[160; 164)
-              NAME_REF@[160; 164)
-                IDENT@[160; 164) "path"
-        R_CURLY@[164; 165) "}"
-    SEMICOLON@[165; 166) ";"
-  WHITESPACE@[166; 167) " "
-  COMMENT@[167; 179) "// Rust 2015"
-  WHITESPACE@[179; 180) "\n"
-  USE_ITEM@[180; 206)
-    USE_KW@[180; 183) "use"
-    WHITESPACE@[183; 184) " "
-    USE_TREE@[184; 205)
-      COLON2@[184; 186) "::"
-      USE_TREE_LIST@[186; 205)
-        L_CURLY@[186; 187) "{"
-        USE_TREE@[187; 204)
-          USE_TREE_LIST@[187; 204)
-            L_CURLY@[187; 188) "{"
-            USE_TREE@[188; 203)
-              USE_TREE_LIST@[188; 203)
-                L_CURLY@[188; 189) "{"
-                USE_TREE@[189; 202)
-                  PATH@[189; 202)
-                    PATH@[189; 194)
-                      PATH_SEGMENT@[189; 194)
-                        CRATE_KW@[189; 194) "crate"
-                    COLON2@[194; 196) "::"
-                    PATH_SEGMENT@[196; 202)
-                      NAME_REF@[196; 202)
-                        IDENT@[196; 202) "export"
-                R_CURLY@[202; 203) "}"
-            R_CURLY@[203; 204) "}"
-        R_CURLY@[204; 205) "}"
-    SEMICOLON@[205; 206) ";"
-  WHITESPACE@[206; 207) " "
-  COMMENT@[207; 249) "// Nonsensical but pe ..."
-  WHITESPACE@[249; 250) "\n"
+SOURCE_FILE@0..250
+  USE_ITEM@0..58
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..57
+      USE_TREE_LIST@4..57
+        L_CURLY@4..5 "{"
+        USE_TREE@5..28
+          PATH@5..28
+            PATH@5..22
+              PATH@5..16
+                PATH@5..10
+                  PATH_SEGMENT@5..10
+                    CRATE_KW@5..10 "crate"
+                COLON2@10..12 "::"
+                PATH_SEGMENT@12..16
+                  NAME_REF@12..16
+                    IDENT@12..16 "path"
+              COLON2@16..18 "::"
+              PATH_SEGMENT@18..22
+                NAME_REF@18..22
+                  IDENT@18..22 "from"
+            COLON2@22..24 "::"
+            PATH_SEGMENT@24..28
+              NAME_REF@24..28
+                IDENT@24..28 "root"
+        COMMA@28..29 ","
+        WHITESPACE@29..30 " "
+        USE_TREE@30..56
+          PATH@30..56
+            PATH@30..44
+              PATH@30..38
+                PATH@30..32
+                  PATH_SEGMENT@30..32
+                    NAME_REF@30..32
+                      IDENT@30..32 "or"
+                COLON2@32..34 "::"
+                PATH_SEGMENT@34..38
+                  NAME_REF@34..38
+                    IDENT@34..38 "path"
+              COLON2@38..40 "::"
+              PATH_SEGMENT@40..44
+                NAME_REF@40..44
+                  IDENT@40..44 "from"
+            COLON2@44..46 "::"
+            PATH_SEGMENT@46..56
+              NAME_REF@46..56
+                IDENT@46..56 "crate_name"
+        R_CURLY@56..57 "}"
+    SEMICOLON@57..58 ";"
+  WHITESPACE@58..59 " "
+  COMMENT@59..97 "// Rust 2018 (with a  ..."
+  WHITESPACE@97..98 "\n"
+  USE_ITEM@98..121
+    USE_KW@98..101 "use"
+    WHITESPACE@101..102 " "
+    USE_TREE@102..120
+      USE_TREE_LIST@102..120
+        L_CURLY@102..103 "{"
+        USE_TREE@103..119
+          PATH@103..119
+            PATH@103..113
+              PATH@103..107
+                PATH_SEGMENT@103..107
+                  NAME_REF@103..107
+                    IDENT@103..107 "path"
+              COLON2@107..109 "::"
+              PATH_SEGMENT@109..113
+                NAME_REF@109..113
+                  IDENT@109..113 "from"
+            COLON2@113..115 "::"
+            PATH_SEGMENT@115..119
+              NAME_REF@115..119
+                IDENT@115..119 "root"
+        R_CURLY@119..120 "}"
+    SEMICOLON@120..121 ";"
+  WHITESPACE@121..122 " "
+  COMMENT@122..134 "// Rust 2015"
+  WHITESPACE@134..135 "\n"
+  USE_ITEM@135..166
+    USE_KW@135..138 "use"
+    WHITESPACE@138..139 " "
+    USE_TREE@139..165
+      COLON2@139..141 "::"
+      USE_TREE_LIST@141..165
+        L_CURLY@141..142 "{"
+        USE_TREE@142..164
+          PATH@142..164
+            PATH@142..158
+              PATH@142..146
+                PATH_SEGMENT@142..146
+                  NAME_REF@142..146
+                    IDENT@142..146 "some"
+              COLON2@146..148 "::"
+              PATH_SEGMENT@148..158
+                NAME_REF@148..158
+                  IDENT@148..158 "arbritrary"
+            COLON2@158..160 "::"
+            PATH_SEGMENT@160..164
+              NAME_REF@160..164
+                IDENT@160..164 "path"
+        R_CURLY@164..165 "}"
+    SEMICOLON@165..166 ";"
+  WHITESPACE@166..167 " "
+  COMMENT@167..179 "// Rust 2015"
+  WHITESPACE@179..180 "\n"
+  USE_ITEM@180..206
+    USE_KW@180..183 "use"
+    WHITESPACE@183..184 " "
+    USE_TREE@184..205
+      COLON2@184..186 "::"
+      USE_TREE_LIST@186..205
+        L_CURLY@186..187 "{"
+        USE_TREE@187..204
+          USE_TREE_LIST@187..204
+            L_CURLY@187..188 "{"
+            USE_TREE@188..203
+              USE_TREE_LIST@188..203
+                L_CURLY@188..189 "{"
+                USE_TREE@189..202
+                  PATH@189..202
+                    PATH@189..194
+                      PATH_SEGMENT@189..194
+                        CRATE_KW@189..194 "crate"
+                    COLON2@194..196 "::"
+                    PATH_SEGMENT@196..202
+                      NAME_REF@196..202
+                        IDENT@196..202 "export"
+                R_CURLY@202..203 "}"
+            R_CURLY@203..204 "}"
+        R_CURLY@204..205 "}"
+    SEMICOLON@205..206 ";"
+  WHITESPACE@206..207 " "
+  COMMENT@207..249 "// Nonsensical but pe ..."
+  WHITESPACE@249..250 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index e3f5a7f04..a46d76fde 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -1,62 +1,62 @@
-SOURCE_FILE@[0; 49)
-  FN_DEF@[0; 48)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "test"
-    TYPE_PARAM_LIST@[7; 10)
-      L_ANGLE@[7; 8) "<"
-      TYPE_PARAM@[8; 9)
-        NAME@[8; 9)
-          IDENT@[8; 9) "F"
-      R_ANGLE@[9; 10) ">"
-    PARAM_LIST@[10; 12)
-      L_PAREN@[10; 11) "("
-      R_PAREN@[11; 12) ")"
-    WHITESPACE@[12; 13) "\n"
-    WHERE_CLAUSE@[13; 44)
-      WHERE_KW@[13; 18) "where"
-      WHITESPACE@[18; 22) "\n   "
-      WHERE_PRED@[22; 44)
-        FOR_TYPE@[22; 31)
-          FOR_KW@[22; 25) "for"
-          TYPE_PARAM_LIST@[25; 29)
-            L_ANGLE@[25; 26) "<"
-            LIFETIME_PARAM@[26; 28)
-              LIFETIME@[26; 28) "\'a"
-            R_ANGLE@[28; 29) ">"
-          WHITESPACE@[29; 30) " "
-          PATH_TYPE@[30; 31)
-            PATH@[30; 31)
-              PATH_SEGMENT@[30; 31)
-                NAME_REF@[30; 31)
-                  IDENT@[30; 31) "F"
-        COLON@[31; 32) ":"
-        WHITESPACE@[32; 33) " "
-        TYPE_BOUND_LIST@[33; 44)
-          TYPE_BOUND@[33; 44)
-            PATH_TYPE@[33; 44)
-              PATH@[33; 44)
-                PATH_SEGMENT@[33; 44)
-                  NAME_REF@[33; 35)
-                    IDENT@[33; 35) "Fn"
-                  PARAM_LIST@[35; 44)
-                    L_PAREN@[35; 36) "("
-                    PARAM@[36; 43)
-                      REFERENCE_TYPE@[36; 43)
-                        AMP@[36; 37) "&"
-                        LIFETIME@[37; 39) "\'a"
-                        WHITESPACE@[39; 40) " "
-                        PATH_TYPE@[40; 43)
-                          PATH@[40; 43)
-                            PATH_SEGMENT@[40; 43)
-                              NAME_REF@[40; 43)
-                                IDENT@[40; 43) "str"
-                    R_PAREN@[43; 44) ")"
-    WHITESPACE@[44; 45) "\n"
-    BLOCK_EXPR@[45; 48)
-      BLOCK@[45; 48)
-        L_CURLY@[45; 46) "{"
-        WHITESPACE@[46; 47) " "
-        R_CURLY@[47; 48) "}"
-  WHITESPACE@[48; 49) "\n"
+SOURCE_FILE@0..49
+  FN_DEF@0..48
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "test"
+    TYPE_PARAM_LIST@7..10
+      L_ANGLE@7..8 "<"
+      TYPE_PARAM@8..9
+        NAME@8..9
+          IDENT@8..9 "F"
+      R_ANGLE@9..10 ">"
+    PARAM_LIST@10..12
+      L_PAREN@10..11 "("
+      R_PAREN@11..12 ")"
+    WHITESPACE@12..13 "\n"
+    WHERE_CLAUSE@13..44
+      WHERE_KW@13..18 "where"
+      WHITESPACE@18..22 "\n   "
+      WHERE_PRED@22..44
+        FOR_TYPE@22..31
+          FOR_KW@22..25 "for"
+          TYPE_PARAM_LIST@25..29
+            L_ANGLE@25..26 "<"
+            LIFETIME_PARAM@26..28
+              LIFETIME@26..28 "\'a"
+            R_ANGLE@28..29 ">"
+          WHITESPACE@29..30 " "
+          PATH_TYPE@30..31
+            PATH@30..31
+              PATH_SEGMENT@30..31
+                NAME_REF@30..31
+                  IDENT@30..31 "F"
+        COLON@31..32 ":"
+        WHITESPACE@32..33 " "
+        TYPE_BOUND_LIST@33..44
+          TYPE_BOUND@33..44
+            PATH_TYPE@33..44
+              PATH@33..44
+                PATH_SEGMENT@33..44
+                  NAME_REF@33..35
+                    IDENT@33..35 "Fn"
+                  PARAM_LIST@35..44
+                    L_PAREN@35..36 "("
+                    PARAM@36..43
+                      REFERENCE_TYPE@36..43
+                        AMP@36..37 "&"
+                        LIFETIME@37..39 "\'a"
+                        WHITESPACE@39..40 " "
+                        PATH_TYPE@40..43
+                          PATH@40..43
+                            PATH_SEGMENT@40..43
+                              NAME_REF@40..43
+                                IDENT@40..43 "str"
+                    R_PAREN@43..44 ")"
+    WHITESPACE@44..45 "\n"
+    BLOCK_EXPR@45..48
+      BLOCK@45..48
+        L_CURLY@45..46 "{"
+        WHITESPACE@46..47 " "
+        R_CURLY@47..48 "}"
+  WHITESPACE@48..49 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
index a0cf1e4f6..20eba09f5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
@@ -1,60 +1,60 @@
-SOURCE_FILE@[0; 39)
-  TYPE_ALIAS_DEF@[0; 38)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "F"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    PATH_TYPE@[9; 37)
-      PATH@[9; 37)
-        PATH_SEGMENT@[9; 37)
-          NAME_REF@[9; 12)
-            IDENT@[9; 12) "Box"
-          TYPE_ARG_LIST@[12; 37)
-            L_ANGLE@[12; 13) "<"
-            TYPE_ARG@[13; 36)
-              PATH_TYPE@[13; 36)
-                PATH@[13; 36)
-                  PATH_SEGMENT@[13; 36)
-                    NAME_REF@[13; 15)
-                      IDENT@[13; 15) "Fn"
-                    PARAM_LIST@[15; 36)
-                      L_PAREN@[15; 16) "("
-                      PARAM@[16; 19)
-                        PATH_TYPE@[16; 19)
-                          PATH@[16; 19)
-                            PATH_SEGMENT@[16; 19)
-                              NAME_REF@[16; 19)
-                                IDENT@[16; 19) "i32"
-                      COMMA@[19; 20) ","
-                      WHITESPACE@[20; 21) " "
-                      PARAM@[21; 25)
-                        REFERENCE_TYPE@[21; 25)
-                          AMP@[21; 22) "&"
-                          PATH_TYPE@[22; 25)
-                            PATH@[22; 25)
-                              PATH_SEGMENT@[22; 25)
-                                NAME_REF@[22; 25)
-                                  IDENT@[22; 25) "i32"
-                      COMMA@[25; 26) ","
-                      WHITESPACE@[26; 27) " "
-                      PARAM@[27; 31)
-                        REFERENCE_TYPE@[27; 31)
-                          AMP@[27; 28) "&"
-                          PATH_TYPE@[28; 31)
-                            PATH@[28; 31)
-                              PATH_SEGMENT@[28; 31)
-                                NAME_REF@[28; 31)
-                                  IDENT@[28; 31) "i32"
-                      COMMA@[31; 32) ","
-                      WHITESPACE@[32; 33) " "
-                      PARAM@[33; 35)
-                        TUPLE_TYPE@[33; 35)
-                          L_PAREN@[33; 34) "("
-                          R_PAREN@[34; 35) ")"
-                      R_PAREN@[35; 36) ")"
-            R_ANGLE@[36; 37) ">"
-    SEMICOLON@[37; 38) ";"
-  WHITESPACE@[38; 39) "\n"
+SOURCE_FILE@0..39
+  TYPE_ALIAS_DEF@0..38
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "F"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..37
+      PATH@9..37
+        PATH_SEGMENT@9..37
+          NAME_REF@9..12
+            IDENT@9..12 "Box"
+          TYPE_ARG_LIST@12..37
+            L_ANGLE@12..13 "<"
+            TYPE_ARG@13..36
+              PATH_TYPE@13..36
+                PATH@13..36
+                  PATH_SEGMENT@13..36
+                    NAME_REF@13..15
+                      IDENT@13..15 "Fn"
+                    PARAM_LIST@15..36
+                      L_PAREN@15..16 "("
+                      PARAM@16..19
+                        PATH_TYPE@16..19
+                          PATH@16..19
+                            PATH_SEGMENT@16..19
+                              NAME_REF@16..19
+                                IDENT@16..19 "i32"
+                      COMMA@19..20 ","
+                      WHITESPACE@20..21 " "
+                      PARAM@21..25
+                        REFERENCE_TYPE@21..25
+                          AMP@21..22 "&"
+                          PATH_TYPE@22..25
+                            PATH@22..25
+                              PATH_SEGMENT@22..25
+                                NAME_REF@22..25
+                                  IDENT@22..25 "i32"
+                      COMMA@25..26 ","
+                      WHITESPACE@26..27 " "
+                      PARAM@27..31
+                        REFERENCE_TYPE@27..31
+                          AMP@27..28 "&"
+                          PATH_TYPE@28..31
+                            PATH@28..31
+                              PATH_SEGMENT@28..31
+                                NAME_REF@28..31
+                                  IDENT@28..31 "i32"
+                      COMMA@31..32 ","
+                      WHITESPACE@32..33 " "
+                      PARAM@33..35
+                        TUPLE_TYPE@33..35
+                          L_PAREN@33..34 "("
+                          R_PAREN@34..35 ")"
+                      R_PAREN@35..36 ")"
+            R_ANGLE@36..37 ">"
+    SEMICOLON@37..38 ";"
+  WHITESPACE@38..39 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
index 8ae7909f9..5181fcd2b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
@@ -1,38 +1,38 @@
-SOURCE_FILE@[0; 28)
-  FN_DEF@[0; 27)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    TYPE_PARAM_LIST@[6; 23)
-      L_ANGLE@[6; 7) "<"
-      TYPE_PARAM@[7; 22)
-        NAME@[7; 8)
-          IDENT@[7; 8) "T"
-        COLON@[8; 9) ":"
-        WHITESPACE@[9; 10) " "
-        TYPE_BOUND_LIST@[10; 22)
-          TYPE_BOUND@[10; 15)
-            PATH_TYPE@[10; 15)
-              PATH@[10; 15)
-                PATH_SEGMENT@[10; 15)
-                  NAME_REF@[10; 15)
-                    IDENT@[10; 15) "Clone"
-          WHITESPACE@[15; 16) " "
-          PLUS@[16; 17) "+"
-          WHITESPACE@[17; 18) " "
-          TYPE_BOUND@[18; 22)
-            PATH_TYPE@[18; 22)
-              PATH@[18; 22)
-                PATH_SEGMENT@[18; 22)
-                  NAME_REF@[18; 22)
-                    IDENT@[18; 22) "Copy"
-      R_ANGLE@[22; 23) ">"
-    PARAM_LIST@[23; 25)
-      L_PAREN@[23; 24) "("
-      R_PAREN@[24; 25) ")"
-    BLOCK_EXPR@[25; 27)
-      BLOCK@[25; 27)
-        L_CURLY@[25; 26) "{"
-        R_CURLY@[26; 27) "}"
-  WHITESPACE@[27; 28) "\n"
+SOURCE_FILE@0..28
+  FN_DEF@0..27
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    TYPE_PARAM_LIST@6..23
+      L_ANGLE@6..7 "<"
+      TYPE_PARAM@7..22
+        NAME@7..8
+          IDENT@7..8 "T"
+        COLON@8..9 ":"
+        WHITESPACE@9..10 " "
+        TYPE_BOUND_LIST@10..22
+          TYPE_BOUND@10..15
+            PATH_TYPE@10..15
+              PATH@10..15
+                PATH_SEGMENT@10..15
+                  NAME_REF@10..15
+                    IDENT@10..15 "Clone"
+          WHITESPACE@15..16 " "
+          PLUS@16..17 "+"
+          WHITESPACE@17..18 " "
+          TYPE_BOUND@18..22
+            PATH_TYPE@18..22
+              PATH@18..22
+                PATH_SEGMENT@18..22
+                  NAME_REF@18..22
+                    IDENT@18..22 "Copy"
+      R_ANGLE@22..23 ">"
+    PARAM_LIST@23..25
+      L_PAREN@23..24 "("
+      R_PAREN@24..25 ")"
+    BLOCK_EXPR@25..27
+      BLOCK@25..27
+        L_CURLY@25..26 "{"
+        R_CURLY@26..27 "}"
+  WHITESPACE@27..28 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index 757ac092a..dd41b44e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -1,121 +1,121 @@
-SOURCE_FILE@[0; 128)
-  IMPL_DEF@[0; 127)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 6)
-      PATH@[5; 6)
-        PATH_SEGMENT@[5; 6)
-          NAME_REF@[5; 6)
-            IDENT@[5; 6) "S"
-    WHITESPACE@[6; 7) " "
-    ITEM_LIST@[7; 127)
-      L_CURLY@[7; 8) "{"
-      WHITESPACE@[8; 13) "\n    "
-      FN_DEF@[13; 26)
-        FN_KW@[13; 15) "fn"
-        WHITESPACE@[15; 16) " "
-        NAME@[16; 17)
-          IDENT@[16; 17) "a"
-        PARAM_LIST@[17; 23)
-          L_PAREN@[17; 18) "("
-          SELF_PARAM@[18; 22)
-            SELF_KW@[18; 22) "self"
-          R_PAREN@[22; 23) ")"
-        WHITESPACE@[23; 24) " "
-        BLOCK_EXPR@[24; 26)
-          BLOCK@[24; 26)
-            L_CURLY@[24; 25) "{"
-            R_CURLY@[25; 26) "}"
-      WHITESPACE@[26; 31) "\n    "
-      FN_DEF@[31; 46)
-        FN_KW@[31; 33) "fn"
-        WHITESPACE@[33; 34) " "
-        NAME@[34; 35)
-          IDENT@[34; 35) "b"
-        PARAM_LIST@[35; 43)
-          L_PAREN@[35; 36) "("
-          SELF_PARAM@[36; 41)
-            AMP@[36; 37) "&"
-            SELF_KW@[37; 41) "self"
-          COMMA@[41; 42) ","
-          R_PAREN@[42; 43) ")"
-        WHITESPACE@[43; 44) " "
-        BLOCK_EXPR@[44; 46)
-          BLOCK@[44; 46)
-            L_CURLY@[44; 45) "{"
-            R_CURLY@[45; 46) "}"
-      WHITESPACE@[46; 51) "\n    "
-      FN_DEF@[51; 69)
-        FN_KW@[51; 53) "fn"
-        WHITESPACE@[53; 54) " "
-        NAME@[54; 55)
-          IDENT@[54; 55) "c"
-        PARAM_LIST@[55; 66)
-          L_PAREN@[55; 56) "("
-          SELF_PARAM@[56; 64)
-            AMP@[56; 57) "&"
-            LIFETIME@[57; 59) "\'a"
-            WHITESPACE@[59; 60) " "
-            SELF_KW@[60; 64) "self"
-          COMMA@[64; 65) ","
-          R_PAREN@[65; 66) ")"
-        WHITESPACE@[66; 67) " "
-        BLOCK_EXPR@[67; 69)
-          BLOCK@[67; 69)
-            L_CURLY@[67; 68) "{"
-            R_CURLY@[68; 69) "}"
-      WHITESPACE@[69; 74) "\n    "
-      FN_DEF@[74; 103)
-        FN_KW@[74; 76) "fn"
-        WHITESPACE@[76; 77) " "
-        NAME@[77; 78)
-          IDENT@[77; 78) "d"
-        PARAM_LIST@[78; 100)
-          L_PAREN@[78; 79) "("
-          SELF_PARAM@[79; 91)
-            AMP@[79; 80) "&"
-            LIFETIME@[80; 82) "\'a"
-            WHITESPACE@[82; 83) " "
-            MUT_KW@[83; 86) "mut"
-            WHITESPACE@[86; 87) " "
-            SELF_KW@[87; 91) "self"
-          COMMA@[91; 92) ","
-          WHITESPACE@[92; 93) " "
-          PARAM@[93; 99)
-            BIND_PAT@[93; 94)
-              NAME@[93; 94)
-                IDENT@[93; 94) "x"
-            COLON@[94; 95) ":"
-            WHITESPACE@[95; 96) " "
-            PATH_TYPE@[96; 99)
-              PATH@[96; 99)
-                PATH_SEGMENT@[96; 99)
-                  NAME_REF@[96; 99)
-                    IDENT@[96; 99) "i32"
-          R_PAREN@[99; 100) ")"
-        WHITESPACE@[100; 101) " "
-        BLOCK_EXPR@[101; 103)
-          BLOCK@[101; 103)
-            L_CURLY@[101; 102) "{"
-            R_CURLY@[102; 103) "}"
-      WHITESPACE@[103; 108) "\n    "
-      FN_DEF@[108; 125)
-        FN_KW@[108; 110) "fn"
-        WHITESPACE@[110; 111) " "
-        NAME@[111; 112)
-          IDENT@[111; 112) "e"
-        PARAM_LIST@[112; 122)
-          L_PAREN@[112; 113) "("
-          SELF_PARAM@[113; 121)
-            MUT_KW@[113; 116) "mut"
-            WHITESPACE@[116; 117) " "
-            SELF_KW@[117; 121) "self"
-          R_PAREN@[121; 122) ")"
-        WHITESPACE@[122; 123) " "
-        BLOCK_EXPR@[123; 125)
-          BLOCK@[123; 125)
-            L_CURLY@[123; 124) "{"
-            R_CURLY@[124; 125) "}"
-      WHITESPACE@[125; 126) "\n"
-      R_CURLY@[126; 127) "}"
-  WHITESPACE@[127; 128) "\n"
+SOURCE_FILE@0..128
+  IMPL_DEF@0..127
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..6
+      PATH@5..6
+        PATH_SEGMENT@5..6
+          NAME_REF@5..6
+            IDENT@5..6 "S"
+    WHITESPACE@6..7 " "
+    ITEM_LIST@7..127
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..13 "\n    "
+      FN_DEF@13..26
+        FN_KW@13..15 "fn"
+        WHITESPACE@15..16 " "
+        NAME@16..17
+          IDENT@16..17 "a"
+        PARAM_LIST@17..23
+          L_PAREN@17..18 "("
+          SELF_PARAM@18..22
+            SELF_KW@18..22 "self"
+          R_PAREN@22..23 ")"
+        WHITESPACE@23..24 " "
+        BLOCK_EXPR@24..26
+          BLOCK@24..26
+            L_CURLY@24..25 "{"
+            R_CURLY@25..26 "}"
+      WHITESPACE@26..31 "\n    "
+      FN_DEF@31..46
+        FN_KW@31..33 "fn"
+        WHITESPACE@33..34 " "
+        NAME@34..35
+          IDENT@34..35 "b"
+        PARAM_LIST@35..43
+          L_PAREN@35..36 "("
+          SELF_PARAM@36..41
+            AMP@36..37 "&"
+            SELF_KW@37..41 "self"
+          COMMA@41..42 ","
+          R_PAREN@42..43 ")"
+        WHITESPACE@43..44 " "
+        BLOCK_EXPR@44..46
+          BLOCK@44..46
+            L_CURLY@44..45 "{"
+            R_CURLY@45..46 "}"
+      WHITESPACE@46..51 "\n    "
+      FN_DEF@51..69
+        FN_KW@51..53 "fn"
+        WHITESPACE@53..54 " "
+        NAME@54..55
+          IDENT@54..55 "c"
+        PARAM_LIST@55..66
+          L_PAREN@55..56 "("
+          SELF_PARAM@56..64
+            AMP@56..57 "&"
+            LIFETIME@57..59 "\'a"
+            WHITESPACE@59..60 " "
+            SELF_KW@60..64 "self"
+          COMMA@64..65 ","
+          R_PAREN@65..66 ")"
+        WHITESPACE@66..67 " "
+        BLOCK_EXPR@67..69
+          BLOCK@67..69
+            L_CURLY@67..68 "{"
+            R_CURLY@68..69 "}"
+      WHITESPACE@69..74 "\n    "
+      FN_DEF@74..103
+        FN_KW@74..76 "fn"
+        WHITESPACE@76..77 " "
+        NAME@77..78
+          IDENT@77..78 "d"
+        PARAM_LIST@78..100
+          L_PAREN@78..79 "("
+          SELF_PARAM@79..91
+            AMP@79..80 "&"
+            LIFETIME@80..82 "\'a"
+            WHITESPACE@82..83 " "
+            MUT_KW@83..86 "mut"
+            WHITESPACE@86..87 " "
+            SELF_KW@87..91 "self"
+          COMMA@91..92 ","
+          WHITESPACE@92..93 " "
+          PARAM@93..99
+            BIND_PAT@93..94
+              NAME@93..94
+                IDENT@93..94 "x"
+            COLON@94..95 ":"
+            WHITESPACE@95..96 " "
+            PATH_TYPE@96..99
+              PATH@96..99
+                PATH_SEGMENT@96..99
+                  NAME_REF@96..99
+                    IDENT@96..99 "i32"
+          R_PAREN@99..100 ")"
+        WHITESPACE@100..101 " "
+        BLOCK_EXPR@101..103
+          BLOCK@101..103
+            L_CURLY@101..102 "{"
+            R_CURLY@102..103 "}"
+      WHITESPACE@103..108 "\n    "
+      FN_DEF@108..125
+        FN_KW@108..110 "fn"
+        WHITESPACE@110..111 " "
+        NAME@111..112
+          IDENT@111..112 "e"
+        PARAM_LIST@112..122
+          L_PAREN@112..113 "("
+          SELF_PARAM@113..121
+            MUT_KW@113..116 "mut"
+            WHITESPACE@116..117 " "
+            SELF_KW@117..121 "self"
+          R_PAREN@121..122 ")"
+        WHITESPACE@122..123 " "
+        BLOCK_EXPR@123..125
+          BLOCK@123..125
+            L_CURLY@123..124 "{"
+            R_CURLY@124..125 "}"
+      WHITESPACE@125..126 "\n"
+      R_CURLY@126..127 "}"
+  WHITESPACE@127..128 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index 027abf179..7cb9e1d55 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
@@ -1,40 +1,40 @@
-SOURCE_FILE@[0; 35)
-  STRUCT_DEF@[0; 34)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 8)
-      IDENT@[7; 8) "S"
-    TYPE_PARAM_LIST@[8; 33)
-      L_ANGLE@[8; 9) "<"
-      TYPE_PARAM@[9; 32)
-        NAME@[9; 10)
-          IDENT@[9; 10) "T"
-        COLON@[10; 11) ":"
-        WHITESPACE@[11; 12) " "
-        TYPE_BOUND_LIST@[12; 32)
-          TYPE_BOUND@[12; 14)
-            LIFETIME@[12; 14) "\'a"
-          WHITESPACE@[14; 15) " "
-          PLUS@[15; 16) "+"
-          WHITESPACE@[16; 17) " "
-          TYPE_BOUND@[17; 23)
-            QUESTION@[17; 18) "?"
-            PATH_TYPE@[18; 23)
-              PATH@[18; 23)
-                PATH_SEGMENT@[18; 23)
-                  NAME_REF@[18; 23)
-                    IDENT@[18; 23) "Sized"
-          WHITESPACE@[23; 24) " "
-          PLUS@[24; 25) "+"
-          WHITESPACE@[25; 26) " "
-          TYPE_BOUND@[26; 32)
-            L_PAREN@[26; 27) "("
-            PATH_TYPE@[27; 31)
-              PATH@[27; 31)
-                PATH_SEGMENT@[27; 31)
-                  NAME_REF@[27; 31)
-                    IDENT@[27; 31) "Copy"
-            R_PAREN@[31; 32) ")"
-      R_ANGLE@[32; 33) ">"
-    SEMICOLON@[33; 34) ";"
-  WHITESPACE@[34; 35) "\n"
+SOURCE_FILE@0..35
+  STRUCT_DEF@0..34
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..8
+      IDENT@7..8 "S"
+    TYPE_PARAM_LIST@8..33
+      L_ANGLE@8..9 "<"
+      TYPE_PARAM@9..32
+        NAME@9..10
+          IDENT@9..10 "T"
+        COLON@10..11 ":"
+        WHITESPACE@11..12 " "
+        TYPE_BOUND_LIST@12..32
+          TYPE_BOUND@12..14
+            LIFETIME@12..14 "\'a"
+          WHITESPACE@14..15 " "
+          PLUS@15..16 "+"
+          WHITESPACE@16..17 " "
+          TYPE_BOUND@17..23
+            QUESTION@17..18 "?"
+            PATH_TYPE@18..23
+              PATH@18..23
+                PATH_SEGMENT@18..23
+                  NAME_REF@18..23
+                    IDENT@18..23 "Sized"
+          WHITESPACE@23..24 " "
+          PLUS@24..25 "+"
+          WHITESPACE@25..26 " "
+          TYPE_BOUND@26..32
+            L_PAREN@26..27 "("
+            PATH_TYPE@27..31
+              PATH@27..31
+                PATH_SEGMENT@27..31
+                  NAME_REF@27..31
+                    IDENT@27..31 "Copy"
+            R_PAREN@31..32 ")"
+      R_ANGLE@32..33 ">"
+    SEMICOLON@33..34 ";"
+  WHITESPACE@34..35 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
index f4697fed6..a8ddd20c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
@@ -1,97 +1,97 @@
-SOURCE_FILE@[0; 103)
-  FN_DEF@[0; 102)
-    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; 102)
-      BLOCK@[9; 102)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 33)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PATH_PAT@[19; 27)
-            PATH@[19; 27)
-              PATH@[19; 22)
-                PATH_SEGMENT@[19; 22)
-                  NAME_REF@[19; 22)
-                    IDENT@[19; 22) "foo"
-              COLON2@[22; 24) "::"
-              PATH_SEGMENT@[24; 27)
-                NAME_REF@[24; 27)
-                  IDENT@[24; 27) "Bar"
-          WHITESPACE@[27; 28) " "
-          EQ@[28; 29) "="
-          WHITESPACE@[29; 30) " "
-          TUPLE_EXPR@[30; 32)
-            L_PAREN@[30; 31) "("
-            R_PAREN@[31; 32) ")"
-          SEMICOLON@[32; 33) ";"
-        WHITESPACE@[33; 38) "\n    "
-        LET_STMT@[38; 53)
-          LET_KW@[38; 41) "let"
-          WHITESPACE@[41; 42) " "
-          PATH_PAT@[42; 47)
-            PATH@[42; 47)
-              PATH_SEGMENT@[42; 47)
-                COLON2@[42; 44) "::"
-                NAME_REF@[44; 47)
-                  IDENT@[44; 47) "Bar"
-          WHITESPACE@[47; 48) " "
-          EQ@[48; 49) "="
-          WHITESPACE@[49; 50) " "
-          TUPLE_EXPR@[50; 52)
-            L_PAREN@[50; 51) "("
-            R_PAREN@[51; 52) ")"
-          SEMICOLON@[52; 53) ";"
-        WHITESPACE@[53; 58) "\n    "
-        LET_STMT@[58; 78)
-          LET_KW@[58; 61) "let"
-          WHITESPACE@[61; 62) " "
-          RECORD_PAT@[62; 72)
-            PATH@[62; 65)
-              PATH_SEGMENT@[62; 65)
-                NAME_REF@[62; 65)
-                  IDENT@[62; 65) "Bar"
-            WHITESPACE@[65; 66) " "
-            RECORD_FIELD_PAT_LIST@[66; 72)
-              L_CURLY@[66; 67) "{"
-              WHITESPACE@[67; 68) " "
-              DOT2@[68; 70) ".."
-              WHITESPACE@[70; 71) " "
-              R_CURLY@[71; 72) "}"
-          WHITESPACE@[72; 73) " "
-          EQ@[73; 74) "="
-          WHITESPACE@[74; 75) " "
-          TUPLE_EXPR@[75; 77)
-            L_PAREN@[75; 76) "("
-            R_PAREN@[76; 77) ")"
-          SEMICOLON@[77; 78) ";"
-        WHITESPACE@[78; 83) "\n    "
-        LET_STMT@[83; 100)
-          LET_KW@[83; 86) "let"
-          WHITESPACE@[86; 87) " "
-          TUPLE_STRUCT_PAT@[87; 94)
-            PATH@[87; 90)
-              PATH_SEGMENT@[87; 90)
-                NAME_REF@[87; 90)
-                  IDENT@[87; 90) "Bar"
-            L_PAREN@[90; 91) "("
-            DOT_DOT_PAT@[91; 93)
-              DOT2@[91; 93) ".."
-            R_PAREN@[93; 94) ")"
-          WHITESPACE@[94; 95) " "
-          EQ@[95; 96) "="
-          WHITESPACE@[96; 97) " "
-          TUPLE_EXPR@[97; 99)
-            L_PAREN@[97; 98) "("
-            R_PAREN@[98; 99) ")"
-          SEMICOLON@[99; 100) ";"
-        WHITESPACE@[100; 101) "\n"
-        R_CURLY@[101; 102) "}"
-  WHITESPACE@[102; 103) "\n"
+SOURCE_FILE@0..103
+  FN_DEF@0..102
+    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..102
+      BLOCK@9..102
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..33
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PATH_PAT@19..27
+            PATH@19..27
+              PATH@19..22
+                PATH_SEGMENT@19..22
+                  NAME_REF@19..22
+                    IDENT@19..22 "foo"
+              COLON2@22..24 "::"
+              PATH_SEGMENT@24..27
+                NAME_REF@24..27
+                  IDENT@24..27 "Bar"
+          WHITESPACE@27..28 " "
+          EQ@28..29 "="
+          WHITESPACE@29..30 " "
+          TUPLE_EXPR@30..32
+            L_PAREN@30..31 "("
+            R_PAREN@31..32 ")"
+          SEMICOLON@32..33 ";"
+        WHITESPACE@33..38 "\n    "
+        LET_STMT@38..53
+          LET_KW@38..41 "let"
+          WHITESPACE@41..42 " "
+          PATH_PAT@42..47
+            PATH@42..47
+              PATH_SEGMENT@42..47
+                COLON2@42..44 "::"
+                NAME_REF@44..47
+                  IDENT@44..47 "Bar"
+          WHITESPACE@47..48 " "
+          EQ@48..49 "="
+          WHITESPACE@49..50 " "
+          TUPLE_EXPR@50..52
+            L_PAREN@50..51 "("
+            R_PAREN@51..52 ")"
+          SEMICOLON@52..53 ";"
+        WHITESPACE@53..58 "\n    "
+        LET_STMT@58..78
+          LET_KW@58..61 "let"
+          WHITESPACE@61..62 " "
+          RECORD_PAT@62..72
+            PATH@62..65
+              PATH_SEGMENT@62..65
+                NAME_REF@62..65
+                  IDENT@62..65 "Bar"
+            WHITESPACE@65..66 " "
+            RECORD_FIELD_PAT_LIST@66..72
+              L_CURLY@66..67 "{"
+              WHITESPACE@67..68 " "
+              DOT2@68..70 ".."
+              WHITESPACE@70..71 " "
+              R_CURLY@71..72 "}"
+          WHITESPACE@72..73 " "
+          EQ@73..74 "="
+          WHITESPACE@74..75 " "
+          TUPLE_EXPR@75..77
+            L_PAREN@75..76 "("
+            R_PAREN@76..77 ")"
+          SEMICOLON@77..78 ";"
+        WHITESPACE@78..83 "\n    "
+        LET_STMT@83..100
+          LET_KW@83..86 "let"
+          WHITESPACE@86..87 " "
+          TUPLE_STRUCT_PAT@87..94
+            PATH@87..90
+              PATH_SEGMENT@87..90
+                NAME_REF@87..90
+                  IDENT@87..90 "Bar"
+            L_PAREN@90..91 "("
+            DOT_DOT_PAT@91..93
+              DOT2@91..93 ".."
+            R_PAREN@93..94 ")"
+          WHITESPACE@94..95 " "
+          EQ@95..96 "="
+          WHITESPACE@96..97 " "
+          TUPLE_EXPR@97..99
+            L_PAREN@97..98 "("
+            R_PAREN@98..99 ")"
+          SEMICOLON@99..100 ";"
+        WHITESPACE@100..101 "\n"
+        R_CURLY@101..102 "}"
+  WHITESPACE@102..103 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index cc759310a..df8ada62a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
@@ -1,26 +1,26 @@
-SOURCE_FILE@[0; 26)
-  FN_DEF@[0; 25)
-    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; 25)
-      BLOCK@[9; 25)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 23)
-          LOOP_EXPR@[15; 22)
-            LOOP_KW@[15; 19) "loop"
-            WHITESPACE@[19; 20) " "
-            BLOCK_EXPR@[20; 22)
-              BLOCK@[20; 22)
-                L_CURLY@[20; 21) "{"
-                R_CURLY@[21; 22) "}"
-          SEMICOLON@[22; 23) ";"
-        WHITESPACE@[23; 24) "\n"
-        R_CURLY@[24; 25) "}"
-  WHITESPACE@[25; 26) "\n"
+SOURCE_FILE@0..26
+  FN_DEF@0..25
+    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..25
+      BLOCK@9..25
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..23
+          LOOP_EXPR@15..22
+            LOOP_KW@15..19 "loop"
+            WHITESPACE@19..20 " "
+            BLOCK_EXPR@20..22
+              BLOCK@20..22
+                L_CURLY@20..21 "{"
+                R_CURLY@21..22 "}"
+          SEMICOLON@22..23 ";"
+        WHITESPACE@23..24 "\n"
+        R_CURLY@24..25 "}"
+  WHITESPACE@25..26 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast
index 506f56fff..869875875 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast
@@ -1,9 +1,9 @@
-SOURCE_FILE@[0; 10)
-  EXTERN_BLOCK@[0; 9)
-    ABI@[0; 6)
-      EXTERN_KW@[0; 6) "extern"
-    WHITESPACE@[6; 7) " "
-    EXTERN_ITEM_LIST@[7; 9)
-      L_CURLY@[7; 8) "{"
-      R_CURLY@[8; 9) "}"
-  WHITESPACE@[9; 10) "\n"
+SOURCE_FILE@0..10
+  EXTERN_BLOCK@0..9
+    ABI@0..6
+      EXTERN_KW@0..6 "extern"
+    WHITESPACE@6..7 " "
+    EXTERN_ITEM_LIST@7..9
+      L_CURLY@7..8 "{"
+      R_CURLY@8..9 "}"
+  WHITESPACE@9..10 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
index c2fafe472..de01cc79e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
@@ -1,60 +1,60 @@
-SOURCE_FILE@[0; 48)
-  FN_DEF@[0; 47)
-    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; 47)
-      BLOCK@[9; 47)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 21)
-          FIELD_EXPR@[15; 20)
-            PATH_EXPR@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "x"
-            DOT@[16; 17) "."
-            NAME_REF@[17; 20)
-              IDENT@[17; 20) "foo"
-          SEMICOLON@[20; 21) ";"
-        WHITESPACE@[21; 26) "\n    "
-        EXPR_STMT@[26; 34)
-          FIELD_EXPR@[26; 33)
-            FIELD_EXPR@[26; 29)
-              PATH_EXPR@[26; 27)
-                PATH@[26; 27)
-                  PATH_SEGMENT@[26; 27)
-                    NAME_REF@[26; 27)
-                      IDENT@[26; 27) "x"
-              DOT@[27; 28) "."
-              NAME_REF@[28; 29)
-                INT_NUMBER@[28; 29) "0"
-            DOT@[29; 30) "."
-            NAME_REF@[30; 33)
-              IDENT@[30; 33) "bar"
-          SEMICOLON@[33; 34) ";"
-        WHITESPACE@[34; 39) "\n    "
-        EXPR_STMT@[39; 45)
-          CALL_EXPR@[39; 44)
-            FIELD_EXPR@[39; 42)
-              PATH_EXPR@[39; 40)
-                PATH@[39; 40)
-                  PATH_SEGMENT@[39; 40)
-                    NAME_REF@[39; 40)
-                      IDENT@[39; 40) "x"
-              DOT@[40; 41) "."
-              NAME_REF@[41; 42)
-                INT_NUMBER@[41; 42) "0"
-            ARG_LIST@[42; 44)
-              L_PAREN@[42; 43) "("
-              R_PAREN@[43; 44) ")"
-          SEMICOLON@[44; 45) ";"
-        WHITESPACE@[45; 46) "\n"
-        R_CURLY@[46; 47) "}"
-  WHITESPACE@[47; 48) "\n"
+SOURCE_FILE@0..48
+  FN_DEF@0..47
+    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..47
+      BLOCK@9..47
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..21
+          FIELD_EXPR@15..20
+            PATH_EXPR@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "x"
+            DOT@16..17 "."
+            NAME_REF@17..20
+              IDENT@17..20 "foo"
+          SEMICOLON@20..21 ";"
+        WHITESPACE@21..26 "\n    "
+        EXPR_STMT@26..34
+          FIELD_EXPR@26..33
+            FIELD_EXPR@26..29
+              PATH_EXPR@26..27
+                PATH@26..27
+                  PATH_SEGMENT@26..27
+                    NAME_REF@26..27
+                      IDENT@26..27 "x"
+              DOT@27..28 "."
+              NAME_REF@28..29
+                INT_NUMBER@28..29 "0"
+            DOT@29..30 "."
+            NAME_REF@30..33
+              IDENT@30..33 "bar"
+          SEMICOLON@33..34 ";"
+        WHITESPACE@34..39 "\n    "
+        EXPR_STMT@39..45
+          CALL_EXPR@39..44
+            FIELD_EXPR@39..42
+              PATH_EXPR@39..40
+                PATH@39..40
+                  PATH_SEGMENT@39..40
+                    NAME_REF@39..40
+                      IDENT@39..40 "x"
+              DOT@40..41 "."
+              NAME_REF@41..42
+                INT_NUMBER@41..42 "0"
+            ARG_LIST@42..44
+              L_PAREN@42..43 "("
+              R_PAREN@43..44 ")"
+          SEMICOLON@44..45 ";"
+        WHITESPACE@45..46 "\n"
+        R_CURLY@46..47 "}"
+  WHITESPACE@47..48 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
index 15d8c736d..283442a8b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
@@ -1,33 +1,33 @@
-SOURCE_FILE@[0; 31)
-  TYPE_ALIAS_DEF@[0; 30)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 8)
-      IDENT@[5; 8) "Foo"
-    WHITESPACE@[8; 9) " "
-    WHERE_CLAUSE@[9; 24)
-      WHERE_KW@[9; 14) "where"
-      WHITESPACE@[14; 15) " "
-      WHERE_PRED@[15; 24)
-        PATH_TYPE@[15; 18)
-          PATH@[15; 18)
-            PATH_SEGMENT@[15; 18)
-              NAME_REF@[15; 18)
-                IDENT@[15; 18) "Foo"
-        COLON@[18; 19) ":"
-        WHITESPACE@[19; 20) " "
-        TYPE_BOUND_LIST@[20; 24)
-          TYPE_BOUND@[20; 24)
-            PATH_TYPE@[20; 24)
-              PATH@[20; 24)
-                PATH_SEGMENT@[20; 24)
-                  NAME_REF@[20; 24)
-                    IDENT@[20; 24) "Copy"
-    WHITESPACE@[24; 25) " "
-    EQ@[25; 26) "="
-    WHITESPACE@[26; 27) " "
-    TUPLE_TYPE@[27; 29)
-      L_PAREN@[27; 28) "("
-      R_PAREN@[28; 29) ")"
-    SEMICOLON@[29; 30) ";"
-  WHITESPACE@[30; 31) "\n"
+SOURCE_FILE@0..31
+  TYPE_ALIAS_DEF@0..30
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..8
+      IDENT@5..8 "Foo"
+    WHITESPACE@8..9 " "
+    WHERE_CLAUSE@9..24
+      WHERE_KW@9..14 "where"
+      WHITESPACE@14..15 " "
+      WHERE_PRED@15..24
+        PATH_TYPE@15..18
+          PATH@15..18
+            PATH_SEGMENT@15..18
+              NAME_REF@15..18
+                IDENT@15..18 "Foo"
+        COLON@18..19 ":"
+        WHITESPACE@19..20 " "
+        TYPE_BOUND_LIST@20..24
+          TYPE_BOUND@20..24
+            PATH_TYPE@20..24
+              PATH@20..24
+                PATH_SEGMENT@20..24
+                  NAME_REF@20..24
+                    IDENT@20..24 "Copy"
+    WHITESPACE@24..25 " "
+    EQ@25..26 "="
+    WHITESPACE@26..27 " "
+    TUPLE_TYPE@27..29
+      L_PAREN@27..28 "("
+      R_PAREN@28..29 ")"
+    SEMICOLON@29..30 ";"
+  WHITESPACE@30..31 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
index a72d56495..e2e871dda 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
@@ -1,35 +1,35 @@
-SOURCE_FILE@[0; 36)
-  TYPE_ALIAS_DEF@[0; 17)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "M"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    POINTER_TYPE@[9; 16)
-      STAR@[9; 10) "*"
-      MUT_KW@[10; 13) "mut"
-      WHITESPACE@[13; 14) " "
-      TUPLE_TYPE@[14; 16)
-        L_PAREN@[14; 15) "("
-        R_PAREN@[15; 16) ")"
-    SEMICOLON@[16; 17) ";"
-  WHITESPACE@[17; 18) "\n"
-  TYPE_ALIAS_DEF@[18; 35)
-    TYPE_KW@[18; 22) "type"
-    WHITESPACE@[22; 23) " "
-    NAME@[23; 24)
-      IDENT@[23; 24) "C"
-    WHITESPACE@[24; 25) " "
-    EQ@[25; 26) "="
-    WHITESPACE@[26; 27) " "
-    POINTER_TYPE@[27; 34)
-      STAR@[27; 28) "*"
-      MUT_KW@[28; 31) "mut"
-      WHITESPACE@[31; 32) " "
-      TUPLE_TYPE@[32; 34)
-        L_PAREN@[32; 33) "("
-        R_PAREN@[33; 34) ")"
-    SEMICOLON@[34; 35) ";"
-  WHITESPACE@[35; 36) "\n"
+SOURCE_FILE@0..36
+  TYPE_ALIAS_DEF@0..17
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "M"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    POINTER_TYPE@9..16
+      STAR@9..10 "*"
+      MUT_KW@10..13 "mut"
+      WHITESPACE@13..14 " "
+      TUPLE_TYPE@14..16
+        L_PAREN@14..15 "("
+        R_PAREN@15..16 ")"
+    SEMICOLON@16..17 ";"
+  WHITESPACE@17..18 "\n"
+  TYPE_ALIAS_DEF@18..35
+    TYPE_KW@18..22 "type"
+    WHITESPACE@22..23 " "
+    NAME@23..24
+      IDENT@23..24 "C"
+    WHITESPACE@24..25 " "
+    EQ@25..26 "="
+    WHITESPACE@26..27 " "
+    POINTER_TYPE@27..34
+      STAR@27..28 "*"
+      MUT_KW@28..31 "mut"
+      WHITESPACE@31..32 " "
+      TUPLE_TYPE@32..34
+        L_PAREN@32..33 "("
+        R_PAREN@33..34 ")"
+    SEMICOLON@34..35 ";"
+  WHITESPACE@35..36 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
index 3c98467c7..a60940fcf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
@@ -1,13 +1,13 @@
-SOURCE_FILE@[0; 16)
-  TYPE_ALIAS_DEF@[0; 15)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 10)
-      IDENT@[5; 10) "Never"
-    WHITESPACE@[10; 11) " "
-    EQ@[11; 12) "="
-    WHITESPACE@[12; 13) " "
-    NEVER_TYPE@[13; 14)
-      BANG@[13; 14) "!"
-    SEMICOLON@[14; 15) ";"
-  WHITESPACE@[15; 16) "\n"
+SOURCE_FILE@0..16
+  TYPE_ALIAS_DEF@0..15
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..10
+      IDENT@5..10 "Never"
+    WHITESPACE@10..11 " "
+    EQ@11..12 "="
+    WHITESPACE@12..13 " "
+    NEVER_TYPE@13..14
+      BANG@13..14 "!"
+    SEMICOLON@14..15 ";"
+  WHITESPACE@15..16 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index adaece119..8ac307cb3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -1,37 +1,37 @@
-SOURCE_FILE@[0; 69)
-  FN_DEF@[0; 68)
-    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; 68)
-      BLOCK@[9; 68)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LOOP_EXPR@[15; 66)
-          LOOP_KW@[15; 19) "loop"
-          WHITESPACE@[19; 20) " "
-          BLOCK_EXPR@[20; 66)
-            BLOCK@[20; 66)
-              L_CURLY@[20; 21) "{"
-              WHITESPACE@[21; 30) "\n        "
-              EXPR_STMT@[30; 39)
-                CONTINUE_EXPR@[30; 38)
-                  CONTINUE_KW@[30; 38) "continue"
-                SEMICOLON@[38; 39) ";"
-              WHITESPACE@[39; 48) "\n        "
-              EXPR_STMT@[48; 60)
-                CONTINUE_EXPR@[48; 59)
-                  CONTINUE_KW@[48; 56) "continue"
-                  WHITESPACE@[56; 57) " "
-                  LIFETIME@[57; 59) "\'l"
-                SEMICOLON@[59; 60) ";"
-              WHITESPACE@[60; 65) "\n    "
-              R_CURLY@[65; 66) "}"
-        WHITESPACE@[66; 67) "\n"
-        R_CURLY@[67; 68) "}"
-  WHITESPACE@[68; 69) "\n"
+SOURCE_FILE@0..69
+  FN_DEF@0..68
+    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..68
+      BLOCK@9..68
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LOOP_EXPR@15..66
+          LOOP_KW@15..19 "loop"
+          WHITESPACE@19..20 " "
+          BLOCK_EXPR@20..66
+            BLOCK@20..66
+              L_CURLY@20..21 "{"
+              WHITESPACE@21..30 "\n        "
+              EXPR_STMT@30..39
+                CONTINUE_EXPR@30..38
+                  CONTINUE_KW@30..38 "continue"
+                SEMICOLON@38..39 ";"
+              WHITESPACE@39..48 "\n        "
+              EXPR_STMT@48..60
+                CONTINUE_EXPR@48..59
+                  CONTINUE_KW@48..56 "continue"
+                  WHITESPACE@56..57 " "
+                  LIFETIME@57..59 "\'l"
+                SEMICOLON@59..60 ";"
+              WHITESPACE@60..65 "\n    "
+              R_CURLY@65..66 "}"
+        WHITESPACE@66..67 "\n"
+        R_CURLY@67..68 "}"
+  WHITESPACE@68..69 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
index 7b43f1294..d59c6006d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
@@ -1,13 +1,13 @@
-SOURCE_FILE@[0; 18)
-  TRAIT_DEF@[0; 17)
-    UNSAFE_KW@[0; 6) "unsafe"
-    WHITESPACE@[6; 7) " "
-    TRAIT_KW@[7; 12) "trait"
-    WHITESPACE@[12; 13) " "
-    NAME@[13; 14)
-      IDENT@[13; 14) "T"
-    WHITESPACE@[14; 15) " "
-    ITEM_LIST@[15; 17)
-      L_CURLY@[15; 16) "{"
-      R_CURLY@[16; 17) "}"
-  WHITESPACE@[17; 18) "\n"
+SOURCE_FILE@0..18
+  TRAIT_DEF@0..17
+    UNSAFE_KW@0..6 "unsafe"
+    WHITESPACE@6..7 " "
+    TRAIT_KW@7..12 "trait"
+    WHITESPACE@12..13 " "
+    NAME@13..14
+      IDENT@13..14 "T"
+    WHITESPACE@14..15 " "
+    ITEM_LIST@15..17
+      L_CURLY@15..16 "{"
+      R_CURLY@16..17 "}"
+  WHITESPACE@17..18 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
index f4c86a05f..61a0b22f4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
@@ -1,21 +1,21 @@
-SOURCE_FILE@[0; 19)
-  TYPE_ALIAS_DEF@[0; 18)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    ARRAY_TYPE@[9; 17)
-      L_BRACK@[9; 10) "["
-      TUPLE_TYPE@[10; 12)
-        L_PAREN@[10; 11) "("
-        R_PAREN@[11; 12) ")"
-      SEMICOLON@[12; 13) ";"
-      WHITESPACE@[13; 14) " "
-      LITERAL@[14; 16)
-        INT_NUMBER@[14; 16) "92"
-      R_BRACK@[16; 17) "]"
-    SEMICOLON@[17; 18) ";"
-  WHITESPACE@[18; 19) "\n"
+SOURCE_FILE@0..19
+  TYPE_ALIAS_DEF@0..18
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    ARRAY_TYPE@9..17
+      L_BRACK@9..10 "["
+      TUPLE_TYPE@10..12
+        L_PAREN@10..11 "("
+        R_PAREN@11..12 ")"
+      SEMICOLON@12..13 ";"
+      WHITESPACE@13..14 " "
+      LITERAL@14..16
+        INT_NUMBER@14..16 "92"
+      R_BRACK@16..17 "]"
+    SEMICOLON@17..18 ";"
+  WHITESPACE@18..19 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 89caee543..6f6400d00 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -1,74 +1,74 @@
-SOURCE_FILE@[0; 69)
-  IMPL_DEF@[0; 68)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 6)
-      PATH@[5; 6)
-        PATH_SEGMENT@[5; 6)
-          NAME_REF@[5; 6)
-            IDENT@[5; 6) "S"
-    WHITESPACE@[6; 7) " "
-    ITEM_LIST@[7; 68)
-      L_CURLY@[7; 8) "{"
-      WHITESPACE@[8; 13) "\n    "
-      FN_DEF@[13; 33)
-        FN_KW@[13; 15) "fn"
-        WHITESPACE@[15; 16) " "
-        NAME@[16; 17)
-          IDENT@[16; 17) "a"
-        PARAM_LIST@[17; 30)
-          L_PAREN@[17; 18) "("
-          SELF_PARAM@[18; 29)
-            SELF_KW@[18; 22) "self"
-            COLON@[22; 23) ":"
-            WHITESPACE@[23; 24) " "
-            REFERENCE_TYPE@[24; 29)
-              AMP@[24; 25) "&"
-              PATH_TYPE@[25; 29)
-                PATH@[25; 29)
-                  PATH_SEGMENT@[25; 29)
-                    NAME_REF@[25; 29)
-                      IDENT@[25; 29) "Self"
-          R_PAREN@[29; 30) ")"
-        WHITESPACE@[30; 31) " "
-        BLOCK_EXPR@[31; 33)
-          BLOCK@[31; 33)
-            L_CURLY@[31; 32) "{"
-            R_CURLY@[32; 33) "}"
-      WHITESPACE@[33; 38) "\n    "
-      FN_DEF@[38; 66)
-        FN_KW@[38; 40) "fn"
-        WHITESPACE@[40; 41) " "
-        NAME@[41; 42)
-          IDENT@[41; 42) "b"
-        PARAM_LIST@[42; 63)
-          L_PAREN@[42; 43) "("
-          SELF_PARAM@[43; 62)
-            MUT_KW@[43; 46) "mut"
-            WHITESPACE@[46; 47) " "
-            SELF_KW@[47; 51) "self"
-            COLON@[51; 52) ":"
-            WHITESPACE@[52; 53) " "
-            PATH_TYPE@[53; 62)
-              PATH@[53; 62)
-                PATH_SEGMENT@[53; 62)
-                  NAME_REF@[53; 56)
-                    IDENT@[53; 56) "Box"
-                  TYPE_ARG_LIST@[56; 62)
-                    L_ANGLE@[56; 57) "<"
-                    TYPE_ARG@[57; 61)
-                      PATH_TYPE@[57; 61)
-                        PATH@[57; 61)
-                          PATH_SEGMENT@[57; 61)
-                            NAME_REF@[57; 61)
-                              IDENT@[57; 61) "Self"
-                    R_ANGLE@[61; 62) ">"
-          R_PAREN@[62; 63) ")"
-        WHITESPACE@[63; 64) " "
-        BLOCK_EXPR@[64; 66)
-          BLOCK@[64; 66)
-            L_CURLY@[64; 65) "{"
-            R_CURLY@[65; 66) "}"
-      WHITESPACE@[66; 67) "\n"
-      R_CURLY@[67; 68) "}"
-  WHITESPACE@[68; 69) "\n"
+SOURCE_FILE@0..69
+  IMPL_DEF@0..68
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..6
+      PATH@5..6
+        PATH_SEGMENT@5..6
+          NAME_REF@5..6
+            IDENT@5..6 "S"
+    WHITESPACE@6..7 " "
+    ITEM_LIST@7..68
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..13 "\n    "
+      FN_DEF@13..33
+        FN_KW@13..15 "fn"
+        WHITESPACE@15..16 " "
+        NAME@16..17
+          IDENT@16..17 "a"
+        PARAM_LIST@17..30
+          L_PAREN@17..18 "("
+          SELF_PARAM@18..29
+            SELF_KW@18..22 "self"
+            COLON@22..23 ":"
+            WHITESPACE@23..24 " "
+            REFERENCE_TYPE@24..29
+              AMP@24..25 "&"
+              PATH_TYPE@25..29
+                PATH@25..29
+                  PATH_SEGMENT@25..29
+                    NAME_REF@25..29
+                      IDENT@25..29 "Self"
+          R_PAREN@29..30 ")"
+        WHITESPACE@30..31 " "
+        BLOCK_EXPR@31..33
+          BLOCK@31..33
+            L_CURLY@31..32 "{"
+            R_CURLY@32..33 "}"
+      WHITESPACE@33..38 "\n    "
+      FN_DEF@38..66
+        FN_KW@38..40 "fn"
+        WHITESPACE@40..41 " "
+        NAME@41..42
+          IDENT@41..42 "b"
+        PARAM_LIST@42..63
+          L_PAREN@42..43 "("
+          SELF_PARAM@43..62
+            MUT_KW@43..46 "mut"
+            WHITESPACE@46..47 " "
+            SELF_KW@47..51 "self"
+            COLON@51..52 ":"
+            WHITESPACE@52..53 " "
+            PATH_TYPE@53..62
+              PATH@53..62
+                PATH_SEGMENT@53..62
+                  NAME_REF@53..56
+                    IDENT@53..56 "Box"
+                  TYPE_ARG_LIST@56..62
+                    L_ANGLE@56..57 "<"
+                    TYPE_ARG@57..61
+                      PATH_TYPE@57..61
+                        PATH@57..61
+                          PATH_SEGMENT@57..61
+                            NAME_REF@57..61
+                              IDENT@57..61 "Self"
+                    R_ANGLE@61..62 ">"
+          R_PAREN@62..63 ")"
+        WHITESPACE@63..64 " "
+        BLOCK_EXPR@64..66
+          BLOCK@64..66
+            L_CURLY@64..65 "{"
+            R_CURLY@65..66 "}"
+      WHITESPACE@66..67 "\n"
+      R_CURLY@67..68 "}"
+  WHITESPACE@68..69 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index 5a42f360c..ba422f1ae 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
@@ -1,45 +1,45 @@
-SOURCE_FILE@[0; 44)
-  FN_DEF@[0; 43)
-    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; 43)
-      BLOCK@[9; 43)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 20)
-          PREFIX_EXPR@[15; 19)
-            STAR@[15; 16) "*"
-            PREFIX_EXPR@[16; 19)
-              STAR@[16; 17) "*"
-              REF_EXPR@[17; 19)
-                AMP@[17; 18) "&"
-                LITERAL@[18; 19)
-                  INT_NUMBER@[18; 19) "1"
-          SEMICOLON@[19; 20) ";"
-        WHITESPACE@[20; 25) "\n    "
-        EXPR_STMT@[25; 32)
-          PREFIX_EXPR@[25; 31)
-            BANG@[25; 26) "!"
-            PREFIX_EXPR@[26; 31)
-              BANG@[26; 27) "!"
-              LITERAL@[27; 31)
-                TRUE_KW@[27; 31) "true"
-          SEMICOLON@[31; 32) ";"
-        WHITESPACE@[32; 37) "\n    "
-        EXPR_STMT@[37; 41)
-          PREFIX_EXPR@[37; 40)
-            MINUS@[37; 38) "-"
-            PREFIX_EXPR@[38; 40)
-              MINUS@[38; 39) "-"
-              LITERAL@[39; 40)
-                INT_NUMBER@[39; 40) "1"
-          SEMICOLON@[40; 41) ";"
-        WHITESPACE@[41; 42) "\n"
-        R_CURLY@[42; 43) "}"
-  WHITESPACE@[43; 44) "\n"
+SOURCE_FILE@0..44
+  FN_DEF@0..43
+    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..43
+      BLOCK@9..43
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..20
+          PREFIX_EXPR@15..19
+            STAR@15..16 "*"
+            PREFIX_EXPR@16..19
+              STAR@16..17 "*"
+              REF_EXPR@17..19
+                AMP@17..18 "&"
+                LITERAL@18..19
+                  INT_NUMBER@18..19 "1"
+          SEMICOLON@19..20 ";"
+        WHITESPACE@20..25 "\n    "
+        EXPR_STMT@25..32
+          PREFIX_EXPR@25..31
+            BANG@25..26 "!"
+            PREFIX_EXPR@26..31
+              BANG@26..27 "!"
+              LITERAL@27..31
+                TRUE_KW@27..31 "true"
+          SEMICOLON@31..32 ";"
+        WHITESPACE@32..37 "\n    "
+        EXPR_STMT@37..41
+          PREFIX_EXPR@37..40
+            MINUS@37..38 "-"
+            PREFIX_EXPR@38..40
+              MINUS@38..39 "-"
+              LITERAL@39..40
+                INT_NUMBER@39..40 "1"
+          SEMICOLON@40..41 ";"
+        WHITESPACE@41..42 "\n"
+        R_CURLY@42..43 "}"
+  WHITESPACE@43..44 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
index c1bedb37c..9e898b7b9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
@@ -1,59 +1,59 @@
-SOURCE_FILE@[0; 60)
-  USE_ITEM@[0; 6)
-    USE_KW@[0; 3) "use"
-    WHITESPACE@[3; 4) " "
-    USE_TREE@[4; 5)
-      STAR@[4; 5) "*"
-    SEMICOLON@[5; 6) ";"
-  WHITESPACE@[6; 7) "\n"
-  USE_ITEM@[7; 15)
-    USE_KW@[7; 10) "use"
-    WHITESPACE@[10; 11) " "
-    USE_TREE@[11; 14)
-      COLON2@[11; 13) "::"
-      STAR@[13; 14) "*"
-    SEMICOLON@[14; 15) ";"
-  WHITESPACE@[15; 16) "\n"
-  USE_ITEM@[16; 36)
-    USE_KW@[16; 19) "use"
-    WHITESPACE@[19; 20) " "
-    USE_TREE@[20; 35)
-      PATH@[20; 30)
-        PATH@[20; 24)
-          PATH_SEGMENT@[20; 24)
-            NAME_REF@[20; 24)
-              IDENT@[20; 24) "some"
-        COLON2@[24; 26) "::"
-        PATH_SEGMENT@[26; 30)
-          NAME_REF@[26; 30)
-            IDENT@[26; 30) "path"
-      COLON2@[30; 32) "::"
-      USE_TREE_LIST@[32; 35)
-        L_CURLY@[32; 33) "{"
-        USE_TREE@[33; 34)
-          STAR@[33; 34) "*"
-        R_CURLY@[34; 35) "}"
-    SEMICOLON@[35; 36) ";"
-  WHITESPACE@[36; 37) "\n"
-  USE_ITEM@[37; 59)
-    USE_KW@[37; 40) "use"
-    WHITESPACE@[40; 41) " "
-    USE_TREE@[41; 58)
-      PATH@[41; 51)
-        PATH@[41; 45)
-          PATH_SEGMENT@[41; 45)
-            NAME_REF@[41; 45)
-              IDENT@[41; 45) "some"
-        COLON2@[45; 47) "::"
-        PATH_SEGMENT@[47; 51)
-          NAME_REF@[47; 51)
-            IDENT@[47; 51) "path"
-      COLON2@[51; 53) "::"
-      USE_TREE_LIST@[53; 58)
-        L_CURLY@[53; 54) "{"
-        USE_TREE@[54; 57)
-          COLON2@[54; 56) "::"
-          STAR@[56; 57) "*"
-        R_CURLY@[57; 58) "}"
-    SEMICOLON@[58; 59) ";"
-  WHITESPACE@[59; 60) "\n"
+SOURCE_FILE@0..60
+  USE_ITEM@0..6
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..5
+      STAR@4..5 "*"
+    SEMICOLON@5..6 ";"
+  WHITESPACE@6..7 "\n"
+  USE_ITEM@7..15
+    USE_KW@7..10 "use"
+    WHITESPACE@10..11 " "
+    USE_TREE@11..14
+      COLON2@11..13 "::"
+      STAR@13..14 "*"
+    SEMICOLON@14..15 ";"
+  WHITESPACE@15..16 "\n"
+  USE_ITEM@16..36
+    USE_KW@16..19 "use"
+    WHITESPACE@19..20 " "
+    USE_TREE@20..35
+      PATH@20..30
+        PATH@20..24
+          PATH_SEGMENT@20..24
+            NAME_REF@20..24
+              IDENT@20..24 "some"
+        COLON2@24..26 "::"
+        PATH_SEGMENT@26..30
+          NAME_REF@26..30
+            IDENT@26..30 "path"
+      COLON2@30..32 "::"
+      USE_TREE_LIST@32..35
+        L_CURLY@32..33 "{"
+        USE_TREE@33..34
+          STAR@33..34 "*"
+        R_CURLY@34..35 "}"
+    SEMICOLON@35..36 ";"
+  WHITESPACE@36..37 "\n"
+  USE_ITEM@37..59
+    USE_KW@37..40 "use"
+    WHITESPACE@40..41 " "
+    USE_TREE@41..58
+      PATH@41..51
+        PATH@41..45
+          PATH_SEGMENT@41..45
+            NAME_REF@41..45
+              IDENT@41..45 "some"
+        COLON2@45..47 "::"
+        PATH_SEGMENT@47..51
+          NAME_REF@47..51
+            IDENT@47..51 "path"
+      COLON2@51..53 "::"
+      USE_TREE_LIST@53..58
+        L_CURLY@53..54 "{"
+        USE_TREE@54..57
+          COLON2@54..56 "::"
+          STAR@56..57 "*"
+        R_CURLY@57..58 "}"
+    SEMICOLON@58..59 ";"
+  WHITESPACE@59..60 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index 767a49ce6..de22b22dd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -1,80 +1,80 @@
-SOURCE_FILE@[0; 89)
-  IMPL_DEF@[0; 88)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 6)
-      PATH@[5; 6)
-        PATH_SEGMENT@[5; 6)
-          NAME_REF@[5; 6)
-            IDENT@[5; 6) "F"
-    WHITESPACE@[6; 7) " "
-    ITEM_LIST@[7; 88)
-      L_CURLY@[7; 8) "{"
-      WHITESPACE@[8; 13) "\n    "
-      TYPE_ALIAS_DEF@[13; 26)
-        TYPE_KW@[13; 17) "type"
-        WHITESPACE@[17; 18) " "
-        NAME@[18; 19)
-          IDENT@[18; 19) "A"
-        WHITESPACE@[19; 20) " "
-        EQ@[20; 21) "="
-        WHITESPACE@[21; 22) " "
-        PATH_TYPE@[22; 25)
-          PATH@[22; 25)
-            PATH_SEGMENT@[22; 25)
-              NAME_REF@[22; 25)
-                IDENT@[22; 25) "i32"
-        SEMICOLON@[25; 26) ";"
-      WHITESPACE@[26; 31) "\n    "
-      CONST_DEF@[31; 49)
-        CONST_KW@[31; 36) "const"
-        WHITESPACE@[36; 37) " "
-        NAME@[37; 38)
-          IDENT@[37; 38) "B"
-        COLON@[38; 39) ":"
-        WHITESPACE@[39; 40) " "
-        PATH_TYPE@[40; 43)
-          PATH@[40; 43)
-            PATH_SEGMENT@[40; 43)
-              NAME_REF@[40; 43)
-                IDENT@[40; 43) "i32"
-        WHITESPACE@[43; 44) " "
-        EQ@[44; 45) "="
-        WHITESPACE@[45; 46) " "
-        LITERAL@[46; 48)
-          INT_NUMBER@[46; 48) "92"
-        SEMICOLON@[48; 49) ";"
-      WHITESPACE@[49; 54) "\n    "
-      FN_DEF@[54; 65)
-        FN_KW@[54; 56) "fn"
-        WHITESPACE@[56; 57) " "
-        NAME@[57; 60)
-          IDENT@[57; 60) "foo"
-        PARAM_LIST@[60; 62)
-          L_PAREN@[60; 61) "("
-          R_PAREN@[61; 62) ")"
-        WHITESPACE@[62; 63) " "
-        BLOCK_EXPR@[63; 65)
-          BLOCK@[63; 65)
-            L_CURLY@[63; 64) "{"
-            R_CURLY@[64; 65) "}"
-      WHITESPACE@[65; 70) "\n    "
-      FN_DEF@[70; 86)
-        FN_KW@[70; 72) "fn"
-        WHITESPACE@[72; 73) " "
-        NAME@[73; 76)
-          IDENT@[73; 76) "bar"
-        PARAM_LIST@[76; 83)
-          L_PAREN@[76; 77) "("
-          SELF_PARAM@[77; 82)
-            AMP@[77; 78) "&"
-            SELF_KW@[78; 82) "self"
-          R_PAREN@[82; 83) ")"
-        WHITESPACE@[83; 84) " "
-        BLOCK_EXPR@[84; 86)
-          BLOCK@[84; 86)
-            L_CURLY@[84; 85) "{"
-            R_CURLY@[85; 86) "}"
-      WHITESPACE@[86; 87) "\n"
-      R_CURLY@[87; 88) "}"
-  WHITESPACE@[88; 89) "\n"
+SOURCE_FILE@0..89
+  IMPL_DEF@0..88
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..6
+      PATH@5..6
+        PATH_SEGMENT@5..6
+          NAME_REF@5..6
+            IDENT@5..6 "F"
+    WHITESPACE@6..7 " "
+    ITEM_LIST@7..88
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..13 "\n    "
+      TYPE_ALIAS_DEF@13..26
+        TYPE_KW@13..17 "type"
+        WHITESPACE@17..18 " "
+        NAME@18..19
+          IDENT@18..19 "A"
+        WHITESPACE@19..20 " "
+        EQ@20..21 "="
+        WHITESPACE@21..22 " "
+        PATH_TYPE@22..25
+          PATH@22..25
+            PATH_SEGMENT@22..25
+              NAME_REF@22..25
+                IDENT@22..25 "i32"
+        SEMICOLON@25..26 ";"
+      WHITESPACE@26..31 "\n    "
+      CONST_DEF@31..49
+        CONST_KW@31..36 "const"
+        WHITESPACE@36..37 " "
+        NAME@37..38
+          IDENT@37..38 "B"
+        COLON@38..39 ":"
+        WHITESPACE@39..40 " "
+        PATH_TYPE@40..43
+          PATH@40..43
+            PATH_SEGMENT@40..43
+              NAME_REF@40..43
+                IDENT@40..43 "i32"
+        WHITESPACE@43..44 " "
+        EQ@44..45 "="
+        WHITESPACE@45..46 " "
+        LITERAL@46..48
+          INT_NUMBER@46..48 "92"
+        SEMICOLON@48..49 ";"
+      WHITESPACE@49..54 "\n    "
+      FN_DEF@54..65
+        FN_KW@54..56 "fn"
+        WHITESPACE@56..57 " "
+        NAME@57..60
+          IDENT@57..60 "foo"
+        PARAM_LIST@60..62
+          L_PAREN@60..61 "("
+          R_PAREN@61..62 ")"
+        WHITESPACE@62..63 " "
+        BLOCK_EXPR@63..65
+          BLOCK@63..65
+            L_CURLY@63..64 "{"
+            R_CURLY@64..65 "}"
+      WHITESPACE@65..70 "\n    "
+      FN_DEF@70..86
+        FN_KW@70..72 "fn"
+        WHITESPACE@72..73 " "
+        NAME@73..76
+          IDENT@73..76 "bar"
+        PARAM_LIST@76..83
+          L_PAREN@76..77 "("
+          SELF_PARAM@77..82
+            AMP@77..78 "&"
+            SELF_KW@78..82 "self"
+          R_PAREN@82..83 ")"
+        WHITESPACE@83..84 " "
+        BLOCK_EXPR@84..86
+          BLOCK@84..86
+            L_CURLY@84..85 "{"
+            R_CURLY@85..86 "}"
+      WHITESPACE@86..87 "\n"
+      R_CURLY@87..88 "}"
+  WHITESPACE@88..89 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
index e0fc96d33..1b810607e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
@@ -1,53 +1,53 @@
-SOURCE_FILE@[0; 81)
-  STRUCT_DEF@[0; 20)
-    VISIBILITY@[0; 10)
-      PUB_KW@[0; 3) "pub"
-      L_PAREN@[3; 4) "("
-      CRATE_KW@[4; 9) "crate"
-      R_PAREN@[9; 10) ")"
-    WHITESPACE@[10; 11) " "
-    STRUCT_KW@[11; 17) "struct"
-    WHITESPACE@[17; 18) " "
-    NAME@[18; 19)
-      IDENT@[18; 19) "S"
-    SEMICOLON@[19; 20) ";"
-  WHITESPACE@[20; 21) "\n"
-  STRUCT_DEF@[21; 40)
-    VISIBILITY@[21; 30)
-      PUB_KW@[21; 24) "pub"
-      L_PAREN@[24; 25) "("
-      SELF_KW@[25; 29) "self"
-      R_PAREN@[29; 30) ")"
-    WHITESPACE@[30; 31) " "
-    STRUCT_KW@[31; 37) "struct"
-    WHITESPACE@[37; 38) " "
-    NAME@[38; 39)
-      IDENT@[38; 39) "S"
-    SEMICOLON@[39; 40) ";"
-  WHITESPACE@[40; 41) "\n"
-  STRUCT_DEF@[41; 60)
-    VISIBILITY@[41; 50)
-      PUB_KW@[41; 44) "pub"
-      L_PAREN@[44; 45) "("
-      SELF_KW@[45; 49) "self"
-      R_PAREN@[49; 50) ")"
-    WHITESPACE@[50; 51) " "
-    STRUCT_KW@[51; 57) "struct"
-    WHITESPACE@[57; 58) " "
-    NAME@[58; 59)
-      IDENT@[58; 59) "S"
-    SEMICOLON@[59; 60) ";"
-  WHITESPACE@[60; 61) "\n"
-  STRUCT_DEF@[61; 80)
-    VISIBILITY@[61; 70)
-      PUB_KW@[61; 64) "pub"
-      L_PAREN@[64; 65) "("
-      SELF_KW@[65; 69) "self"
-      R_PAREN@[69; 70) ")"
-    WHITESPACE@[70; 71) " "
-    STRUCT_KW@[71; 77) "struct"
-    WHITESPACE@[77; 78) " "
-    NAME@[78; 79)
-      IDENT@[78; 79) "S"
-    SEMICOLON@[79; 80) ";"
-  WHITESPACE@[80; 81) "\n"
+SOURCE_FILE@0..81
+  STRUCT_DEF@0..20
+    VISIBILITY@0..10
+      PUB_KW@0..3 "pub"
+      L_PAREN@3..4 "("
+      CRATE_KW@4..9 "crate"
+      R_PAREN@9..10 ")"
+    WHITESPACE@10..11 " "
+    STRUCT_KW@11..17 "struct"
+    WHITESPACE@17..18 " "
+    NAME@18..19
+      IDENT@18..19 "S"
+    SEMICOLON@19..20 ";"
+  WHITESPACE@20..21 "\n"
+  STRUCT_DEF@21..40
+    VISIBILITY@21..30
+      PUB_KW@21..24 "pub"
+      L_PAREN@24..25 "("
+      SELF_KW@25..29 "self"
+      R_PAREN@29..30 ")"
+    WHITESPACE@30..31 " "
+    STRUCT_KW@31..37 "struct"
+    WHITESPACE@37..38 " "
+    NAME@38..39
+      IDENT@38..39 "S"
+    SEMICOLON@39..40 ";"
+  WHITESPACE@40..41 "\n"
+  STRUCT_DEF@41..60
+    VISIBILITY@41..50
+      PUB_KW@41..44 "pub"
+      L_PAREN@44..45 "("
+      SELF_KW@45..49 "self"
+      R_PAREN@49..50 ")"
+    WHITESPACE@50..51 " "
+    STRUCT_KW@51..57 "struct"
+    WHITESPACE@57..58 " "
+    NAME@58..59
+      IDENT@58..59 "S"
+    SEMICOLON@59..60 ";"
+  WHITESPACE@60..61 "\n"
+  STRUCT_DEF@61..80
+    VISIBILITY@61..70
+      PUB_KW@61..64 "pub"
+      L_PAREN@64..65 "("
+      SELF_KW@65..69 "self"
+      R_PAREN@69..70 ")"
+    WHITESPACE@70..71 " "
+    STRUCT_KW@71..77 "struct"
+    WHITESPACE@77..78 " "
+    NAME@78..79
+      IDENT@78..79 "S"
+    SEMICOLON@79..80 ";"
+  WHITESPACE@80..81 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
index b7acc3f07..17687617b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
@@ -1,13 +1,13 @@
-SOURCE_FILE@[0; 22)
-  TYPE_ALIAS_DEF@[0; 21)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 16)
-      IDENT@[5; 16) "Placeholder"
-    WHITESPACE@[16; 17) " "
-    EQ@[17; 18) "="
-    WHITESPACE@[18; 19) " "
-    PLACEHOLDER_TYPE@[19; 20)
-      UNDERSCORE@[19; 20) "_"
-    SEMICOLON@[20; 21) ";"
-  WHITESPACE@[21; 22) "\n"
+SOURCE_FILE@0..22
+  TYPE_ALIAS_DEF@0..21
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..16
+      IDENT@5..16 "Placeholder"
+    WHITESPACE@16..17 " "
+    EQ@17..18 "="
+    WHITESPACE@18..19 " "
+    PLACEHOLDER_TYPE@19..20
+      UNDERSCORE@19..20 "_"
+    SEMICOLON@20..21 ";"
+  WHITESPACE@21..22 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index 430e4a999..7da292a2d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
@@ -1,42 +1,42 @@
-SOURCE_FILE@[0; 39)
-  FN_DEF@[0; 38)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 38)
-      BLOCK@[10; 38)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 36)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          SLICE_PAT@[20; 30)
-            L_BRACK@[20; 21) "["
-            BIND_PAT@[21; 22)
-              NAME@[21; 22)
-                IDENT@[21; 22) "a"
-            COMMA@[22; 23) ","
-            WHITESPACE@[23; 24) " "
-            BIND_PAT@[24; 25)
-              NAME@[24; 25)
-                IDENT@[24; 25) "b"
-            COMMA@[25; 26) ","
-            WHITESPACE@[26; 27) " "
-            DOT_DOT_PAT@[27; 29)
-              DOT2@[27; 29) ".."
-            R_BRACK@[29; 30) "]"
-          WHITESPACE@[30; 31) " "
-          EQ@[31; 32) "="
-          WHITESPACE@[32; 33) " "
-          ARRAY_EXPR@[33; 35)
-            L_BRACK@[33; 34) "["
-            R_BRACK@[34; 35) "]"
-          SEMICOLON@[35; 36) ";"
-        WHITESPACE@[36; 37) "\n"
-        R_CURLY@[37; 38) "}"
-  WHITESPACE@[38; 39) "\n"
+SOURCE_FILE@0..39
+  FN_DEF@0..38
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..38
+      BLOCK@10..38
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..36
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          SLICE_PAT@20..30
+            L_BRACK@20..21 "["
+            BIND_PAT@21..22
+              NAME@21..22
+                IDENT@21..22 "a"
+            COMMA@22..23 ","
+            WHITESPACE@23..24 " "
+            BIND_PAT@24..25
+              NAME@24..25
+                IDENT@24..25 "b"
+            COMMA@25..26 ","
+            WHITESPACE@26..27 " "
+            DOT_DOT_PAT@27..29
+              DOT2@27..29 ".."
+            R_BRACK@29..30 "]"
+          WHITESPACE@30..31 " "
+          EQ@31..32 "="
+          WHITESPACE@32..33 " "
+          ARRAY_EXPR@33..35
+            L_BRACK@33..34 "["
+            R_BRACK@34..35 "]"
+          SEMICOLON@35..36 ";"
+        WHITESPACE@36..37 "\n"
+        R_CURLY@37..38 "}"
+  WHITESPACE@38..39 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
index 4eee1e7f1..0a6d77f45 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
@@ -1,17 +1,17 @@
-SOURCE_FILE@[0; 15)
-  TYPE_ALIAS_DEF@[0; 14)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    SLICE_TYPE@[9; 13)
-      L_BRACK@[9; 10) "["
-      TUPLE_TYPE@[10; 12)
-        L_PAREN@[10; 11) "("
-        R_PAREN@[11; 12) ")"
-      R_BRACK@[12; 13) "]"
-    SEMICOLON@[13; 14) ";"
-  WHITESPACE@[14; 15) "\n"
+SOURCE_FILE@0..15
+  TYPE_ALIAS_DEF@0..14
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    SLICE_TYPE@9..13
+      L_BRACK@9..10 "["
+      TUPLE_TYPE@10..12
+        L_PAREN@10..11 "("
+        R_PAREN@11..12 ")"
+      R_BRACK@12..13 "]"
+    SEMICOLON@13..14 ";"
+  WHITESPACE@14..15 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index d8d82dacc..574942f06 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
@@ -1,105 +1,105 @@
-SOURCE_FILE@[0; 97)
-  FN_DEF@[0; 96)
-    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; 96)
-      BLOCK@[9; 96)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 28)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          TUPLE_STRUCT_PAT@[19; 22)
-            PATH@[19; 20)
-              PATH_SEGMENT@[19; 20)
-                NAME_REF@[19; 20)
-                  IDENT@[19; 20) "S"
-            L_PAREN@[20; 21) "("
-            R_PAREN@[21; 22) ")"
-          WHITESPACE@[22; 23) " "
-          EQ@[23; 24) "="
-          WHITESPACE@[24; 25) " "
-          TUPLE_EXPR@[25; 27)
-            L_PAREN@[25; 26) "("
-            R_PAREN@[26; 27) ")"
-          SEMICOLON@[27; 28) ";"
-        WHITESPACE@[28; 33) "\n    "
-        LET_STMT@[33; 47)
-          LET_KW@[33; 36) "let"
-          WHITESPACE@[36; 37) " "
-          TUPLE_STRUCT_PAT@[37; 41)
-            PATH@[37; 38)
-              PATH_SEGMENT@[37; 38)
-                NAME_REF@[37; 38)
-                  IDENT@[37; 38) "S"
-            L_PAREN@[38; 39) "("
-            PLACEHOLDER_PAT@[39; 40)
-              UNDERSCORE@[39; 40) "_"
-            R_PAREN@[40; 41) ")"
-          WHITESPACE@[41; 42) " "
-          EQ@[42; 43) "="
-          WHITESPACE@[43; 44) " "
-          TUPLE_EXPR@[44; 46)
-            L_PAREN@[44; 45) "("
-            R_PAREN@[45; 46) ")"
-          SEMICOLON@[46; 47) ";"
-        WHITESPACE@[47; 52) "\n    "
-        LET_STMT@[52; 67)
-          LET_KW@[52; 55) "let"
-          WHITESPACE@[55; 56) " "
-          TUPLE_STRUCT_PAT@[56; 61)
-            PATH@[56; 57)
-              PATH_SEGMENT@[56; 57)
-                NAME_REF@[56; 57)
-                  IDENT@[56; 57) "S"
-            L_PAREN@[57; 58) "("
-            PLACEHOLDER_PAT@[58; 59)
-              UNDERSCORE@[58; 59) "_"
-            COMMA@[59; 60) ","
-            R_PAREN@[60; 61) ")"
-          WHITESPACE@[61; 62) " "
-          EQ@[62; 63) "="
-          WHITESPACE@[63; 64) " "
-          TUPLE_EXPR@[64; 66)
-            L_PAREN@[64; 65) "("
-            R_PAREN@[65; 66) ")"
-          SEMICOLON@[66; 67) ";"
-        WHITESPACE@[67; 72) "\n    "
-        LET_STMT@[72; 94)
-          LET_KW@[72; 75) "let"
-          WHITESPACE@[75; 76) " "
-          TUPLE_STRUCT_PAT@[76; 88)
-            PATH@[76; 77)
-              PATH_SEGMENT@[76; 77)
-                NAME_REF@[76; 77)
-                  IDENT@[76; 77) "S"
-            L_PAREN@[77; 78) "("
-            PLACEHOLDER_PAT@[78; 79)
-              UNDERSCORE@[78; 79) "_"
-            COMMA@[79; 80) ","
-            WHITESPACE@[80; 81) " "
-            DOT_DOT_PAT@[81; 83)
-              DOT2@[81; 83) ".."
-            WHITESPACE@[83; 84) " "
-            COMMA@[84; 85) ","
-            WHITESPACE@[85; 86) " "
-            BIND_PAT@[86; 87)
-              NAME@[86; 87)
-                IDENT@[86; 87) "x"
-            R_PAREN@[87; 88) ")"
-          WHITESPACE@[88; 89) " "
-          EQ@[89; 90) "="
-          WHITESPACE@[90; 91) " "
-          TUPLE_EXPR@[91; 93)
-            L_PAREN@[91; 92) "("
-            R_PAREN@[92; 93) ")"
-          SEMICOLON@[93; 94) ";"
-        WHITESPACE@[94; 95) "\n"
-        R_CURLY@[95; 96) "}"
-  WHITESPACE@[96; 97) "\n"
+SOURCE_FILE@0..97
+  FN_DEF@0..96
+    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..96
+      BLOCK@9..96
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..28
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          TUPLE_STRUCT_PAT@19..22
+            PATH@19..20
+              PATH_SEGMENT@19..20
+                NAME_REF@19..20
+                  IDENT@19..20 "S"
+            L_PAREN@20..21 "("
+            R_PAREN@21..22 ")"
+          WHITESPACE@22..23 " "
+          EQ@23..24 "="
+          WHITESPACE@24..25 " "
+          TUPLE_EXPR@25..27
+            L_PAREN@25..26 "("
+            R_PAREN@26..27 ")"
+          SEMICOLON@27..28 ";"
+        WHITESPACE@28..33 "\n    "
+        LET_STMT@33..47
+          LET_KW@33..36 "let"
+          WHITESPACE@36..37 " "
+          TUPLE_STRUCT_PAT@37..41
+            PATH@37..38
+              PATH_SEGMENT@37..38
+                NAME_REF@37..38
+                  IDENT@37..38 "S"
+            L_PAREN@38..39 "("
+            PLACEHOLDER_PAT@39..40
+              UNDERSCORE@39..40 "_"
+            R_PAREN@40..41 ")"
+          WHITESPACE@41..42 " "
+          EQ@42..43 "="
+          WHITESPACE@43..44 " "
+          TUPLE_EXPR@44..46
+            L_PAREN@44..45 "("
+            R_PAREN@45..46 ")"
+          SEMICOLON@46..47 ";"
+        WHITESPACE@47..52 "\n    "
+        LET_STMT@52..67
+          LET_KW@52..55 "let"
+          WHITESPACE@55..56 " "
+          TUPLE_STRUCT_PAT@56..61
+            PATH@56..57
+              PATH_SEGMENT@56..57
+                NAME_REF@56..57
+                  IDENT@56..57 "S"
+            L_PAREN@57..58 "("
+            PLACEHOLDER_PAT@58..59
+              UNDERSCORE@58..59 "_"
+            COMMA@59..60 ","
+            R_PAREN@60..61 ")"
+          WHITESPACE@61..62 " "
+          EQ@62..63 "="
+          WHITESPACE@63..64 " "
+          TUPLE_EXPR@64..66
+            L_PAREN@64..65 "("
+            R_PAREN@65..66 ")"
+          SEMICOLON@66..67 ";"
+        WHITESPACE@67..72 "\n    "
+        LET_STMT@72..94
+          LET_KW@72..75 "let"
+          WHITESPACE@75..76 " "
+          TUPLE_STRUCT_PAT@76..88
+            PATH@76..77
+              PATH_SEGMENT@76..77
+                NAME_REF@76..77
+                  IDENT@76..77 "S"
+            L_PAREN@77..78 "("
+            PLACEHOLDER_PAT@78..79
+              UNDERSCORE@78..79 "_"
+            COMMA@79..80 ","
+            WHITESPACE@80..81 " "
+            DOT_DOT_PAT@81..83
+              DOT2@81..83 ".."
+            WHITESPACE@83..84 " "
+            COMMA@84..85 ","
+            WHITESPACE@85..86 " "
+            BIND_PAT@86..87
+              NAME@86..87
+                IDENT@86..87 "x"
+            R_PAREN@87..88 ")"
+          WHITESPACE@88..89 " "
+          EQ@89..90 "="
+          WHITESPACE@90..91 " "
+          TUPLE_EXPR@91..93
+            L_PAREN@91..92 "("
+            R_PAREN@92..93 ")"
+          SEMICOLON@93..94 ";"
+        WHITESPACE@94..95 "\n"
+        R_CURLY@95..96 "}"
+  WHITESPACE@96..97 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index ac6ab31f2..1927438bb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
@@ -1,50 +1,50 @@
-SOURCE_FILE@[0; 52)
-  FN_DEF@[0; 51)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 51)
-      BLOCK@[10; 51)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 28)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          REF_PAT@[20; 22)
-            AMP@[20; 21) "&"
-            BIND_PAT@[21; 22)
-              NAME@[21; 22)
-                IDENT@[21; 22) "a"
-          WHITESPACE@[22; 23) " "
-          EQ@[23; 24) "="
-          WHITESPACE@[24; 25) " "
-          TUPLE_EXPR@[25; 27)
-            L_PAREN@[25; 26) "("
-            R_PAREN@[26; 27) ")"
-          SEMICOLON@[27; 28) ";"
-        WHITESPACE@[28; 33) "\n    "
-        LET_STMT@[33; 49)
-          LET_KW@[33; 36) "let"
-          WHITESPACE@[36; 37) " "
-          REF_PAT@[37; 43)
-            AMP@[37; 38) "&"
-            MUT_KW@[38; 41) "mut"
-            WHITESPACE@[41; 42) " "
-            BIND_PAT@[42; 43)
-              NAME@[42; 43)
-                IDENT@[42; 43) "b"
-          WHITESPACE@[43; 44) " "
-          EQ@[44; 45) "="
-          WHITESPACE@[45; 46) " "
-          TUPLE_EXPR@[46; 48)
-            L_PAREN@[46; 47) "("
-            R_PAREN@[47; 48) ")"
-          SEMICOLON@[48; 49) ";"
-        WHITESPACE@[49; 50) "\n"
-        R_CURLY@[50; 51) "}"
-  WHITESPACE@[51; 52) "\n"
+SOURCE_FILE@0..52
+  FN_DEF@0..51
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..51
+      BLOCK@10..51
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..28
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          REF_PAT@20..22
+            AMP@20..21 "&"
+            BIND_PAT@21..22
+              NAME@21..22
+                IDENT@21..22 "a"
+          WHITESPACE@22..23 " "
+          EQ@23..24 "="
+          WHITESPACE@24..25 " "
+          TUPLE_EXPR@25..27
+            L_PAREN@25..26 "("
+            R_PAREN@26..27 ")"
+          SEMICOLON@27..28 ";"
+        WHITESPACE@28..33 "\n    "
+        LET_STMT@33..49
+          LET_KW@33..36 "let"
+          WHITESPACE@36..37 " "
+          REF_PAT@37..43
+            AMP@37..38 "&"
+            MUT_KW@38..41 "mut"
+            WHITESPACE@41..42 " "
+            BIND_PAT@42..43
+              NAME@42..43
+                IDENT@42..43 "b"
+          WHITESPACE@43..44 " "
+          EQ@44..45 "="
+          WHITESPACE@45..46 " "
+          TUPLE_EXPR@46..48
+            L_PAREN@46..47 "("
+            R_PAREN@47..48 ")"
+          SEMICOLON@48..49 ";"
+        WHITESPACE@49..50 "\n"
+        R_CURLY@50..51 "}"
+  WHITESPACE@51..52 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index 3371cab82..93f5c738c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -1,43 +1,43 @@
-SOURCE_FILE@[0; 43)
-  TYPE_ALIAS_DEF@[0; 42)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    IMPL_TRAIT_TYPE@[9; 41)
-      IMPL_KW@[9; 13) "impl"
-      WHITESPACE@[13; 14) " "
-      TYPE_BOUND_LIST@[14; 41)
-        TYPE_BOUND@[14; 36)
-          PATH_TYPE@[14; 36)
-            PATH@[14; 36)
-              PATH_SEGMENT@[14; 36)
-                NAME_REF@[14; 22)
-                  IDENT@[14; 22) "Iterator"
-                TYPE_ARG_LIST@[22; 36)
-                  L_ANGLE@[22; 23) "<"
-                  ASSOC_TYPE_ARG@[23; 35)
-                    NAME_REF@[23; 27)
-                      IDENT@[23; 27) "Item"
-                    EQ@[27; 28) "="
-                    PATH_TYPE@[28; 35)
-                      PATH@[28; 35)
-                        PATH_SEGMENT@[28; 35)
-                          NAME_REF@[28; 31)
-                            IDENT@[28; 31) "Foo"
-                          TYPE_ARG_LIST@[31; 35)
-                            L_ANGLE@[31; 32) "<"
-                            LIFETIME_ARG@[32; 34)
-                              LIFETIME@[32; 34) "\'a"
-                            R_ANGLE@[34; 35) ">"
-                  R_ANGLE@[35; 36) ">"
-        WHITESPACE@[36; 37) " "
-        PLUS@[37; 38) "+"
-        WHITESPACE@[38; 39) " "
-        TYPE_BOUND@[39; 41)
-          LIFETIME@[39; 41) "\'a"
-    SEMICOLON@[41; 42) ";"
-  WHITESPACE@[42; 43) "\n"
+SOURCE_FILE@0..43
+  TYPE_ALIAS_DEF@0..42
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    IMPL_TRAIT_TYPE@9..41
+      IMPL_KW@9..13 "impl"
+      WHITESPACE@13..14 " "
+      TYPE_BOUND_LIST@14..41
+        TYPE_BOUND@14..36
+          PATH_TYPE@14..36
+            PATH@14..36
+              PATH_SEGMENT@14..36
+                NAME_REF@14..22
+                  IDENT@14..22 "Iterator"
+                TYPE_ARG_LIST@22..36
+                  L_ANGLE@22..23 "<"
+                  ASSOC_TYPE_ARG@23..35
+                    NAME_REF@23..27
+                      IDENT@23..27 "Item"
+                    EQ@27..28 "="
+                    PATH_TYPE@28..35
+                      PATH@28..35
+                        PATH_SEGMENT@28..35
+                          NAME_REF@28..31
+                            IDENT@28..31 "Foo"
+                          TYPE_ARG_LIST@31..35
+                            L_ANGLE@31..32 "<"
+                            LIFETIME_ARG@32..34
+                              LIFETIME@32..34 "\'a"
+                            R_ANGLE@34..35 ">"
+                  R_ANGLE@35..36 ">"
+        WHITESPACE@36..37 " "
+        PLUS@37..38 "+"
+        WHITESPACE@38..39 " "
+        TYPE_BOUND@39..41
+          LIFETIME@39..41 "\'a"
+    SEMICOLON@41..42 ";"
+  WHITESPACE@42..43 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index e9ca214bb..9effb345f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
@@ -1,90 +1,90 @@
-SOURCE_FILE@[0; 89)
-  FN_DEF@[0; 88)
-    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; 88)
-      BLOCK@[9; 88)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 25)
-          CAST_EXPR@[15; 24)
-            LITERAL@[15; 17)
-              INT_NUMBER@[15; 17) "82"
-            WHITESPACE@[17; 18) " "
-            AS_KW@[18; 20) "as"
-            WHITESPACE@[20; 21) " "
-            PATH_TYPE@[21; 24)
-              PATH@[21; 24)
-                PATH_SEGMENT@[21; 24)
-                  NAME_REF@[21; 24)
-                    IDENT@[21; 24) "i32"
-          SEMICOLON@[24; 25) ";"
-        WHITESPACE@[25; 30) "\n    "
-        EXPR_STMT@[30; 43)
-          BIN_EXPR@[30; 42)
-            CAST_EXPR@[30; 38)
-              LITERAL@[30; 32)
-                INT_NUMBER@[30; 32) "81"
-              WHITESPACE@[32; 33) " "
-              AS_KW@[33; 35) "as"
-              WHITESPACE@[35; 36) " "
-              PATH_TYPE@[36; 38)
-                PATH@[36; 38)
-                  PATH_SEGMENT@[36; 38)
-                    NAME_REF@[36; 38)
-                      IDENT@[36; 38) "i8"
-            WHITESPACE@[38; 39) " "
-            PLUS@[39; 40) "+"
-            WHITESPACE@[40; 41) " "
-            LITERAL@[41; 42)
-              INT_NUMBER@[41; 42) "1"
-          SEMICOLON@[42; 43) ";"
-        WHITESPACE@[43; 48) "\n    "
-        EXPR_STMT@[48; 62)
-          BIN_EXPR@[48; 61)
-            CAST_EXPR@[48; 57)
-              LITERAL@[48; 50)
-                INT_NUMBER@[48; 50) "79"
-              WHITESPACE@[50; 51) " "
-              AS_KW@[51; 53) "as"
-              WHITESPACE@[53; 54) " "
-              PATH_TYPE@[54; 57)
-                PATH@[54; 57)
-                  PATH_SEGMENT@[54; 57)
-                    NAME_REF@[54; 57)
-                      IDENT@[54; 57) "i16"
-            WHITESPACE@[57; 58) " "
-            MINUS@[58; 59) "-"
-            WHITESPACE@[59; 60) " "
-            LITERAL@[60; 61)
-              INT_NUMBER@[60; 61) "1"
-          SEMICOLON@[61; 62) ";"
-        WHITESPACE@[62; 67) "\n    "
-        EXPR_STMT@[67; 86)
-          BIN_EXPR@[67; 85)
-            CAST_EXPR@[67; 77)
-              LITERAL@[67; 71)
-                INT_NUMBER@[67; 71) "0x36"
-              WHITESPACE@[71; 72) " "
-              AS_KW@[72; 74) "as"
-              WHITESPACE@[74; 75) " "
-              PATH_TYPE@[75; 77)
-                PATH@[75; 77)
-                  PATH_SEGMENT@[75; 77)
-                    NAME_REF@[75; 77)
-                      IDENT@[75; 77) "u8"
-            WHITESPACE@[77; 78) " "
-            LTEQ@[78; 80) "<="
-            WHITESPACE@[80; 81) " "
-            LITERAL@[81; 85)
-              INT_NUMBER@[81; 85) "0x37"
-          SEMICOLON@[85; 86) ";"
-        WHITESPACE@[86; 87) "\n"
-        R_CURLY@[87; 88) "}"
-  WHITESPACE@[88; 89) "\n"
+SOURCE_FILE@0..89
+  FN_DEF@0..88
+    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..88
+      BLOCK@9..88
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..25
+          CAST_EXPR@15..24
+            LITERAL@15..17
+              INT_NUMBER@15..17 "82"
+            WHITESPACE@17..18 " "
+            AS_KW@18..20 "as"
+            WHITESPACE@20..21 " "
+            PATH_TYPE@21..24
+              PATH@21..24
+                PATH_SEGMENT@21..24
+                  NAME_REF@21..24
+                    IDENT@21..24 "i32"
+          SEMICOLON@24..25 ";"
+        WHITESPACE@25..30 "\n    "
+        EXPR_STMT@30..43
+          BIN_EXPR@30..42
+            CAST_EXPR@30..38
+              LITERAL@30..32
+                INT_NUMBER@30..32 "81"
+              WHITESPACE@32..33 " "
+              AS_KW@33..35 "as"
+              WHITESPACE@35..36 " "
+              PATH_TYPE@36..38
+                PATH@36..38
+                  PATH_SEGMENT@36..38
+                    NAME_REF@36..38
+                      IDENT@36..38 "i8"
+            WHITESPACE@38..39 " "
+            PLUS@39..40 "+"
+            WHITESPACE@40..41 " "
+            LITERAL@41..42
+              INT_NUMBER@41..42 "1"
+          SEMICOLON@42..43 ";"
+        WHITESPACE@43..48 "\n    "
+        EXPR_STMT@48..62
+          BIN_EXPR@48..61
+            CAST_EXPR@48..57
+              LITERAL@48..50
+                INT_NUMBER@48..50 "79"
+              WHITESPACE@50..51 " "
+              AS_KW@51..53 "as"
+              WHITESPACE@53..54 " "
+              PATH_TYPE@54..57
+                PATH@54..57
+                  PATH_SEGMENT@54..57
+                    NAME_REF@54..57
+                      IDENT@54..57 "i16"
+            WHITESPACE@57..58 " "
+            MINUS@58..59 "-"
+            WHITESPACE@59..60 " "
+            LITERAL@60..61
+              INT_NUMBER@60..61 "1"
+          SEMICOLON@61..62 ";"
+        WHITESPACE@62..67 "\n    "
+        EXPR_STMT@67..86
+          BIN_EXPR@67..85
+            CAST_EXPR@67..77
+              LITERAL@67..71
+                INT_NUMBER@67..71 "0x36"
+              WHITESPACE@71..72 " "
+              AS_KW@72..74 "as"
+              WHITESPACE@74..75 " "
+              PATH_TYPE@75..77
+                PATH@75..77
+                  PATH_SEGMENT@75..77
+                    NAME_REF@75..77
+                      IDENT@75..77 "u8"
+            WHITESPACE@77..78 " "
+            LTEQ@78..80 "<="
+            WHITESPACE@80..81 " "
+            LITERAL@81..85
+              INT_NUMBER@81..85 "0x37"
+          SEMICOLON@85..86 ";"
+        WHITESPACE@86..87 "\n"
+        R_CURLY@87..88 "}"
+  WHITESPACE@88..89 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
index 6fd49c7bc..b6759541e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
@@ -1,209 +1,209 @@
-SOURCE_FILE@[0; 197)
-  FN_DEF@[0; 37)
-    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; 37)
-      BLOCK@[9; 37)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) " "
-        IF_EXPR@[11; 35)
-          IF_KW@[11; 13) "if"
-          WHITESPACE@[13; 14) " "
-          CONDITION@[14; 32)
-            LET_KW@[14; 17) "let"
-            WHITESPACE@[17; 18) " "
-            TUPLE_STRUCT_PAT@[18; 25)
-              PATH@[18; 22)
-                PATH_SEGMENT@[18; 22)
-                  NAME_REF@[18; 22)
-                    IDENT@[18; 22) "Some"
-              L_PAREN@[22; 23) "("
-              PLACEHOLDER_PAT@[23; 24)
-                UNDERSCORE@[23; 24) "_"
-              R_PAREN@[24; 25) ")"
-            WHITESPACE@[25; 26) " "
-            EQ@[26; 27) "="
-            WHITESPACE@[27; 28) " "
-            PATH_EXPR@[28; 32)
-              PATH@[28; 32)
-                PATH_SEGMENT@[28; 32)
-                  NAME_REF@[28; 32)
-                    IDENT@[28; 32) "None"
-          WHITESPACE@[32; 33) " "
-          BLOCK_EXPR@[33; 35)
-            BLOCK@[33; 35)
-              L_CURLY@[33; 34) "{"
-              R_CURLY@[34; 35) "}"
-        WHITESPACE@[35; 36) " "
-        R_CURLY@[36; 37) "}"
-  WHITESPACE@[37; 38) "\n"
-  FN_DEF@[38; 196)
-    FN_KW@[38; 40) "fn"
-    WHITESPACE@[40; 41) " "
-    NAME@[41; 44)
-      IDENT@[41; 44) "bar"
-    PARAM_LIST@[44; 46)
-      L_PAREN@[44; 45) "("
-      R_PAREN@[45; 46) ")"
-    WHITESPACE@[46; 47) " "
-    BLOCK_EXPR@[47; 196)
-      BLOCK@[47; 196)
-        L_CURLY@[47; 48) "{"
-        WHITESPACE@[48; 53) "\n    "
-        EXPR_STMT@[53; 87)
-          IF_EXPR@[53; 87)
-            IF_KW@[53; 55) "if"
-            WHITESPACE@[55; 56) " "
-            CONDITION@[56; 84)
-              LET_KW@[56; 59) "let"
-              WHITESPACE@[59; 60) " "
-              OR_PAT@[60; 77)
-                TUPLE_STRUCT_PAT@[60; 67)
-                  PATH@[60; 64)
-                    PATH_SEGMENT@[60; 64)
-                      NAME_REF@[60; 64)
-                        IDENT@[60; 64) "Some"
-                  L_PAREN@[64; 65) "("
-                  PLACEHOLDER_PAT@[65; 66)
-                    UNDERSCORE@[65; 66) "_"
-                  R_PAREN@[66; 67) ")"
-                WHITESPACE@[67; 68) " "
-                PIPE@[68; 69) "|"
-                WHITESPACE@[69; 70) " "
-                TUPLE_STRUCT_PAT@[70; 77)
-                  PATH@[70; 74)
-                    PATH_SEGMENT@[70; 74)
-                      NAME_REF@[70; 74)
-                        IDENT@[70; 74) "Some"
-                  L_PAREN@[74; 75) "("
-                  PLACEHOLDER_PAT@[75; 76)
-                    UNDERSCORE@[75; 76) "_"
-                  R_PAREN@[76; 77) ")"
-              WHITESPACE@[77; 78) " "
-              EQ@[78; 79) "="
-              WHITESPACE@[79; 80) " "
-              PATH_EXPR@[80; 84)
-                PATH@[80; 84)
-                  PATH_SEGMENT@[80; 84)
-                    NAME_REF@[80; 84)
-                      IDENT@[80; 84) "None"
-            WHITESPACE@[84; 85) " "
-            BLOCK_EXPR@[85; 87)
-              BLOCK@[85; 87)
-                L_CURLY@[85; 86) "{"
-                R_CURLY@[86; 87) "}"
-        WHITESPACE@[87; 92) "\n    "
-        EXPR_STMT@[92; 118)
-          IF_EXPR@[92; 118)
-            IF_KW@[92; 94) "if"
-            WHITESPACE@[94; 95) " "
-            CONDITION@[95; 115)
-              LET_KW@[95; 98) "let"
-              WHITESPACE@[98; 99) " "
-              PIPE@[99; 100) "|"
-              WHITESPACE@[100; 101) " "
-              TUPLE_STRUCT_PAT@[101; 108)
-                PATH@[101; 105)
-                  PATH_SEGMENT@[101; 105)
-                    NAME_REF@[101; 105)
-                      IDENT@[101; 105) "Some"
-                L_PAREN@[105; 106) "("
-                PLACEHOLDER_PAT@[106; 107)
-                  UNDERSCORE@[106; 107) "_"
-                R_PAREN@[107; 108) ")"
-              WHITESPACE@[108; 109) " "
-              EQ@[109; 110) "="
-              WHITESPACE@[110; 111) " "
-              PATH_EXPR@[111; 115)
-                PATH@[111; 115)
-                  PATH_SEGMENT@[111; 115)
-                    NAME_REF@[111; 115)
-                      IDENT@[111; 115) "None"
-            WHITESPACE@[115; 116) " "
-            BLOCK_EXPR@[116; 118)
-              BLOCK@[116; 118)
-                L_CURLY@[116; 117) "{"
-                R_CURLY@[117; 118) "}"
-        WHITESPACE@[118; 123) "\n    "
-        EXPR_STMT@[123; 160)
-          WHILE_EXPR@[123; 160)
-            WHILE_KW@[123; 128) "while"
-            WHITESPACE@[128; 129) " "
-            CONDITION@[129; 157)
-              LET_KW@[129; 132) "let"
-              WHITESPACE@[132; 133) " "
-              OR_PAT@[133; 150)
-                TUPLE_STRUCT_PAT@[133; 140)
-                  PATH@[133; 137)
-                    PATH_SEGMENT@[133; 137)
-                      NAME_REF@[133; 137)
-                        IDENT@[133; 137) "Some"
-                  L_PAREN@[137; 138) "("
-                  PLACEHOLDER_PAT@[138; 139)
-                    UNDERSCORE@[138; 139) "_"
-                  R_PAREN@[139; 140) ")"
-                WHITESPACE@[140; 141) " "
-                PIPE@[141; 142) "|"
-                WHITESPACE@[142; 143) " "
-                TUPLE_STRUCT_PAT@[143; 150)
-                  PATH@[143; 147)
-                    PATH_SEGMENT@[143; 147)
-                      NAME_REF@[143; 147)
-                        IDENT@[143; 147) "Some"
-                  L_PAREN@[147; 148) "("
-                  PLACEHOLDER_PAT@[148; 149)
-                    UNDERSCORE@[148; 149) "_"
-                  R_PAREN@[149; 150) ")"
-              WHITESPACE@[150; 151) " "
-              EQ@[151; 152) "="
-              WHITESPACE@[152; 153) " "
-              PATH_EXPR@[153; 157)
-                PATH@[153; 157)
-                  PATH_SEGMENT@[153; 157)
-                    NAME_REF@[153; 157)
-                      IDENT@[153; 157) "None"
-            WHITESPACE@[157; 158) " "
-            BLOCK_EXPR@[158; 160)
-              BLOCK@[158; 160)
-                L_CURLY@[158; 159) "{"
-                R_CURLY@[159; 160) "}"
-        WHITESPACE@[160; 165) "\n    "
-        WHILE_EXPR@[165; 194)
-          WHILE_KW@[165; 170) "while"
-          WHITESPACE@[170; 171) " "
-          CONDITION@[171; 191)
-            LET_KW@[171; 174) "let"
-            WHITESPACE@[174; 175) " "
-            PIPE@[175; 176) "|"
-            WHITESPACE@[176; 177) " "
-            TUPLE_STRUCT_PAT@[177; 184)
-              PATH@[177; 181)
-                PATH_SEGMENT@[177; 181)
-                  NAME_REF@[177; 181)
-                    IDENT@[177; 181) "Some"
-              L_PAREN@[181; 182) "("
-              PLACEHOLDER_PAT@[182; 183)
-                UNDERSCORE@[182; 183) "_"
-              R_PAREN@[183; 184) ")"
-            WHITESPACE@[184; 185) " "
-            EQ@[185; 186) "="
-            WHITESPACE@[186; 187) " "
-            PATH_EXPR@[187; 191)
-              PATH@[187; 191)
-                PATH_SEGMENT@[187; 191)
-                  NAME_REF@[187; 191)
-                    IDENT@[187; 191) "None"
-          WHITESPACE@[191; 192) " "
-          BLOCK_EXPR@[192; 194)
-            BLOCK@[192; 194)
-              L_CURLY@[192; 193) "{"
-              R_CURLY@[193; 194) "}"
-        WHITESPACE@[194; 195) "\n"
-        R_CURLY@[195; 196) "}"
-  WHITESPACE@[196; 197) "\n"
+SOURCE_FILE@0..197
+  FN_DEF@0..37
+    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..37
+      BLOCK@9..37
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 " "
+        IF_EXPR@11..35
+          IF_KW@11..13 "if"
+          WHITESPACE@13..14 " "
+          CONDITION@14..32
+            LET_KW@14..17 "let"
+            WHITESPACE@17..18 " "
+            TUPLE_STRUCT_PAT@18..25
+              PATH@18..22
+                PATH_SEGMENT@18..22
+                  NAME_REF@18..22
+                    IDENT@18..22 "Some"
+              L_PAREN@22..23 "("
+              PLACEHOLDER_PAT@23..24
+                UNDERSCORE@23..24 "_"
+              R_PAREN@24..25 ")"
+            WHITESPACE@25..26 " "
+            EQ@26..27 "="
+            WHITESPACE@27..28 " "
+            PATH_EXPR@28..32
+              PATH@28..32
+                PATH_SEGMENT@28..32
+                  NAME_REF@28..32
+                    IDENT@28..32 "None"
+          WHITESPACE@32..33 " "
+          BLOCK_EXPR@33..35
+            BLOCK@33..35
+              L_CURLY@33..34 "{"
+              R_CURLY@34..35 "}"
+        WHITESPACE@35..36 " "
+        R_CURLY@36..37 "}"
+  WHITESPACE@37..38 "\n"
+  FN_DEF@38..196
+    FN_KW@38..40 "fn"
+    WHITESPACE@40..41 " "
+    NAME@41..44
+      IDENT@41..44 "bar"
+    PARAM_LIST@44..46
+      L_PAREN@44..45 "("
+      R_PAREN@45..46 ")"
+    WHITESPACE@46..47 " "
+    BLOCK_EXPR@47..196
+      BLOCK@47..196
+        L_CURLY@47..48 "{"
+        WHITESPACE@48..53 "\n    "
+        EXPR_STMT@53..87
+          IF_EXPR@53..87
+            IF_KW@53..55 "if"
+            WHITESPACE@55..56 " "
+            CONDITION@56..84
+              LET_KW@56..59 "let"
+              WHITESPACE@59..60 " "
+              OR_PAT@60..77
+                TUPLE_STRUCT_PAT@60..67
+                  PATH@60..64
+                    PATH_SEGMENT@60..64
+                      NAME_REF@60..64
+                        IDENT@60..64 "Some"
+                  L_PAREN@64..65 "("
+                  PLACEHOLDER_PAT@65..66
+                    UNDERSCORE@65..66 "_"
+                  R_PAREN@66..67 ")"
+                WHITESPACE@67..68 " "
+                PIPE@68..69 "|"
+                WHITESPACE@69..70 " "
+                TUPLE_STRUCT_PAT@70..77
+                  PATH@70..74
+                    PATH_SEGMENT@70..74
+                      NAME_REF@70..74
+                        IDENT@70..74 "Some"
+                  L_PAREN@74..75 "("
+                  PLACEHOLDER_PAT@75..76
+                    UNDERSCORE@75..76 "_"
+                  R_PAREN@76..77 ")"
+              WHITESPACE@77..78 " "
+              EQ@78..79 "="
+              WHITESPACE@79..80 " "
+              PATH_EXPR@80..84
+                PATH@80..84
+                  PATH_SEGMENT@80..84
+                    NAME_REF@80..84
+                      IDENT@80..84 "None"
+            WHITESPACE@84..85 " "
+            BLOCK_EXPR@85..87
+              BLOCK@85..87
+                L_CURLY@85..86 "{"
+                R_CURLY@86..87 "}"
+        WHITESPACE@87..92 "\n    "
+        EXPR_STMT@92..118
+          IF_EXPR@92..118
+            IF_KW@92..94 "if"
+            WHITESPACE@94..95 " "
+            CONDITION@95..115
+              LET_KW@95..98 "let"
+              WHITESPACE@98..99 " "
+              PIPE@99..100 "|"
+              WHITESPACE@100..101 " "
+              TUPLE_STRUCT_PAT@101..108
+                PATH@101..105
+                  PATH_SEGMENT@101..105
+                    NAME_REF@101..105
+                      IDENT@101..105 "Some"
+                L_PAREN@105..106 "("
+                PLACEHOLDER_PAT@106..107
+                  UNDERSCORE@106..107 "_"
+                R_PAREN@107..108 ")"
+              WHITESPACE@108..109 " "
+              EQ@109..110 "="
+              WHITESPACE@110..111 " "
+              PATH_EXPR@111..115
+                PATH@111..115
+                  PATH_SEGMENT@111..115
+                    NAME_REF@111..115
+                      IDENT@111..115 "None"
+            WHITESPACE@115..116 " "
+            BLOCK_EXPR@116..118
+              BLOCK@116..118
+                L_CURLY@116..117 "{"
+                R_CURLY@117..118 "}"
+        WHITESPACE@118..123 "\n    "
+        EXPR_STMT@123..160
+          WHILE_EXPR@123..160
+            WHILE_KW@123..128 "while"
+            WHITESPACE@128..129 " "
+            CONDITION@129..157
+              LET_KW@129..132 "let"
+              WHITESPACE@132..133 " "
+              OR_PAT@133..150
+                TUPLE_STRUCT_PAT@133..140
+                  PATH@133..137
+                    PATH_SEGMENT@133..137
+                      NAME_REF@133..137
+                        IDENT@133..137 "Some"
+                  L_PAREN@137..138 "("
+                  PLACEHOLDER_PAT@138..139
+                    UNDERSCORE@138..139 "_"
+                  R_PAREN@139..140 ")"
+                WHITESPACE@140..141 " "
+                PIPE@141..142 "|"
+                WHITESPACE@142..143 " "
+                TUPLE_STRUCT_PAT@143..150
+                  PATH@143..147
+                    PATH_SEGMENT@143..147
+                      NAME_REF@143..147
+                        IDENT@143..147 "Some"
+                  L_PAREN@147..148 "("
+                  PLACEHOLDER_PAT@148..149
+                    UNDERSCORE@148..149 "_"
+                  R_PAREN@149..150 ")"
+              WHITESPACE@150..151 " "
+              EQ@151..152 "="
+              WHITESPACE@152..153 " "
+              PATH_EXPR@153..157
+                PATH@153..157
+                  PATH_SEGMENT@153..157
+                    NAME_REF@153..157
+                      IDENT@153..157 "None"
+            WHITESPACE@157..158 " "
+            BLOCK_EXPR@158..160
+              BLOCK@158..160
+                L_CURLY@158..159 "{"
+                R_CURLY@159..160 "}"
+        WHITESPACE@160..165 "\n    "
+        WHILE_EXPR@165..194
+          WHILE_KW@165..170 "while"
+          WHITESPACE@170..171 " "
+          CONDITION@171..191
+            LET_KW@171..174 "let"
+            WHITESPACE@174..175 " "
+            PIPE@175..176 "|"
+            WHITESPACE@176..177 " "
+            TUPLE_STRUCT_PAT@177..184
+              PATH@177..181
+                PATH_SEGMENT@177..181
+                  NAME_REF@177..181
+                    IDENT@177..181 "Some"
+              L_PAREN@181..182 "("
+              PLACEHOLDER_PAT@182..183
+                UNDERSCORE@182..183 "_"
+              R_PAREN@183..184 ")"
+            WHITESPACE@184..185 " "
+            EQ@185..186 "="
+            WHITESPACE@186..187 " "
+            PATH_EXPR@187..191
+              PATH@187..191
+                PATH_SEGMENT@187..191
+                  NAME_REF@187..191
+                    IDENT@187..191 "None"
+          WHITESPACE@191..192 " "
+          BLOCK_EXPR@192..194
+            BLOCK@192..194
+              L_CURLY@192..193 "{"
+              R_CURLY@193..194 "}"
+        WHITESPACE@194..195 "\n"
+        R_CURLY@195..196 "}"
+  WHITESPACE@196..197 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
index aaef408cc..e5138a599 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
@@ -1,89 +1,89 @@
-SOURCE_FILE@[0; 93)
-  FN_DEF@[0; 92)
-    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; 92)
-      BLOCK@[9; 92)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 29)
-          WHILE_EXPR@[15; 28)
-            WHILE_KW@[15; 20) "while"
-            WHITESPACE@[20; 21) " "
-            CONDITION@[21; 25)
-              LITERAL@[21; 25)
-                TRUE_KW@[21; 25) "true"
-            WHITESPACE@[25; 26) " "
-            BLOCK_EXPR@[26; 28)
-              BLOCK@[26; 28)
-                L_CURLY@[26; 27) "{"
-                R_CURLY@[27; 28) "}"
-          SEMICOLON@[28; 29) ";"
-        WHITESPACE@[29; 34) "\n    "
-        EXPR_STMT@[34; 67)
-          WHILE_EXPR@[34; 66)
-            WHILE_KW@[34; 39) "while"
-            WHITESPACE@[39; 40) " "
-            CONDITION@[40; 63)
-              LET_KW@[40; 43) "let"
-              WHITESPACE@[43; 44) " "
-              TUPLE_STRUCT_PAT@[44; 51)
-                PATH@[44; 48)
-                  PATH_SEGMENT@[44; 48)
-                    NAME_REF@[44; 48)
-                      IDENT@[44; 48) "Some"
-                L_PAREN@[48; 49) "("
-                BIND_PAT@[49; 50)
-                  NAME@[49; 50)
-                    IDENT@[49; 50) "x"
-                R_PAREN@[50; 51) ")"
-              WHITESPACE@[51; 52) " "
-              EQ@[52; 53) "="
-              WHITESPACE@[53; 54) " "
-              METHOD_CALL_EXPR@[54; 63)
-                PATH_EXPR@[54; 56)
-                  PATH@[54; 56)
-                    PATH_SEGMENT@[54; 56)
-                      NAME_REF@[54; 56)
-                        IDENT@[54; 56) "it"
-                DOT@[56; 57) "."
-                NAME_REF@[57; 61)
-                  IDENT@[57; 61) "next"
-                ARG_LIST@[61; 63)
-                  L_PAREN@[61; 62) "("
-                  R_PAREN@[62; 63) ")"
-            WHITESPACE@[63; 64) " "
-            BLOCK_EXPR@[64; 66)
-              BLOCK@[64; 66)
-                L_CURLY@[64; 65) "{"
-                R_CURLY@[65; 66) "}"
-          SEMICOLON@[66; 67) ";"
-        WHITESPACE@[67; 72) "\n    "
-        EXPR_STMT@[72; 90)
-          WHILE_EXPR@[72; 89)
-            WHILE_KW@[72; 77) "while"
-            WHITESPACE@[77; 78) " "
-            CONDITION@[78; 86)
-              BLOCK_EXPR@[78; 86)
-                BLOCK@[78; 86)
-                  L_CURLY@[78; 79) "{"
-                  WHITESPACE@[79; 80) " "
-                  LITERAL@[80; 84)
-                    TRUE_KW@[80; 84) "true"
-                  WHITESPACE@[84; 85) " "
-                  R_CURLY@[85; 86) "}"
-            WHITESPACE@[86; 87) " "
-            BLOCK_EXPR@[87; 89)
-              BLOCK@[87; 89)
-                L_CURLY@[87; 88) "{"
-                R_CURLY@[88; 89) "}"
-          SEMICOLON@[89; 90) ";"
-        WHITESPACE@[90; 91) "\n"
-        R_CURLY@[91; 92) "}"
-  WHITESPACE@[92; 93) "\n"
+SOURCE_FILE@0..93
+  FN_DEF@0..92
+    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..92
+      BLOCK@9..92
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..29
+          WHILE_EXPR@15..28
+            WHILE_KW@15..20 "while"
+            WHITESPACE@20..21 " "
+            CONDITION@21..25
+              LITERAL@21..25
+                TRUE_KW@21..25 "true"
+            WHITESPACE@25..26 " "
+            BLOCK_EXPR@26..28
+              BLOCK@26..28
+                L_CURLY@26..27 "{"
+                R_CURLY@27..28 "}"
+          SEMICOLON@28..29 ";"
+        WHITESPACE@29..34 "\n    "
+        EXPR_STMT@34..67
+          WHILE_EXPR@34..66
+            WHILE_KW@34..39 "while"
+            WHITESPACE@39..40 " "
+            CONDITION@40..63
+              LET_KW@40..43 "let"
+              WHITESPACE@43..44 " "
+              TUPLE_STRUCT_PAT@44..51
+                PATH@44..48
+                  PATH_SEGMENT@44..48
+                    NAME_REF@44..48
+                      IDENT@44..48 "Some"
+                L_PAREN@48..49 "("
+                BIND_PAT@49..50
+                  NAME@49..50
+                    IDENT@49..50 "x"
+                R_PAREN@50..51 ")"
+              WHITESPACE@51..52 " "
+              EQ@52..53 "="
+              WHITESPACE@53..54 " "
+              METHOD_CALL_EXPR@54..63
+                PATH_EXPR@54..56
+                  PATH@54..56
+                    PATH_SEGMENT@54..56
+                      NAME_REF@54..56
+                        IDENT@54..56 "it"
+                DOT@56..57 "."
+                NAME_REF@57..61
+                  IDENT@57..61 "next"
+                ARG_LIST@61..63
+                  L_PAREN@61..62 "("
+                  R_PAREN@62..63 ")"
+            WHITESPACE@63..64 " "
+            BLOCK_EXPR@64..66
+              BLOCK@64..66
+                L_CURLY@64..65 "{"
+                R_CURLY@65..66 "}"
+          SEMICOLON@66..67 ";"
+        WHITESPACE@67..72 "\n    "
+        EXPR_STMT@72..90
+          WHILE_EXPR@72..89
+            WHILE_KW@72..77 "while"
+            WHITESPACE@77..78 " "
+            CONDITION@78..86
+              BLOCK_EXPR@78..86
+                BLOCK@78..86
+                  L_CURLY@78..79 "{"
+                  WHITESPACE@79..80 " "
+                  LITERAL@80..84
+                    TRUE_KW@80..84 "true"
+                  WHITESPACE@84..85 " "
+                  R_CURLY@85..86 "}"
+            WHITESPACE@86..87 " "
+            BLOCK_EXPR@87..89
+              BLOCK@87..89
+                L_CURLY@87..88 "{"
+                R_CURLY@88..89 "}"
+          SEMICOLON@89..90 ";"
+        WHITESPACE@90..91 "\n"
+        R_CURLY@91..92 "}"
+  WHITESPACE@92..93 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
index bad769850..72705e148 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
@@ -1,98 +1,98 @@
-SOURCE_FILE@[0; 113)
-  TYPE_ALIAS_DEF@[0; 14)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    FN_POINTER_TYPE@[9; 13)
-      FN_KW@[9; 11) "fn"
-      PARAM_LIST@[11; 13)
-        L_PAREN@[11; 12) "("
-        R_PAREN@[12; 13) ")"
-    SEMICOLON@[13; 14) ";"
-  WHITESPACE@[14; 15) "\n"
-  TYPE_ALIAS_DEF@[15; 36)
-    TYPE_KW@[15; 19) "type"
-    WHITESPACE@[19; 20) " "
-    NAME@[20; 21)
-      IDENT@[20; 21) "B"
-    WHITESPACE@[21; 22) " "
-    EQ@[22; 23) "="
-    WHITESPACE@[23; 24) " "
-    FN_POINTER_TYPE@[24; 35)
-      UNSAFE_KW@[24; 30) "unsafe"
-      WHITESPACE@[30; 31) " "
-      FN_KW@[31; 33) "fn"
-      PARAM_LIST@[33; 35)
-        L_PAREN@[33; 34) "("
-        R_PAREN@[34; 35) ")"
-    SEMICOLON@[35; 36) ";"
-  WHITESPACE@[36; 37) "\n"
-  TYPE_ALIAS_DEF@[37; 69)
-    TYPE_KW@[37; 41) "type"
-    WHITESPACE@[41; 42) " "
-    NAME@[42; 43)
-      IDENT@[42; 43) "C"
-    WHITESPACE@[43; 44) " "
-    EQ@[44; 45) "="
-    WHITESPACE@[45; 46) " "
-    FN_POINTER_TYPE@[46; 68)
-      UNSAFE_KW@[46; 52) "unsafe"
-      WHITESPACE@[52; 53) " "
-      ABI@[53; 63)
-        EXTERN_KW@[53; 59) "extern"
-        WHITESPACE@[59; 60) " "
-        STRING@[60; 63) "\"C\""
-      WHITESPACE@[63; 64) " "
-      FN_KW@[64; 66) "fn"
-      PARAM_LIST@[66; 68)
-        L_PAREN@[66; 67) "("
-        R_PAREN@[67; 68) ")"
-    SEMICOLON@[68; 69) ";"
-  WHITESPACE@[69; 70) "\n"
-  TYPE_ALIAS_DEF@[70; 112)
-    TYPE_KW@[70; 74) "type"
-    WHITESPACE@[74; 75) " "
-    NAME@[75; 76)
-      IDENT@[75; 76) "D"
-    WHITESPACE@[76; 77) " "
-    EQ@[77; 78) "="
-    WHITESPACE@[78; 79) " "
-    FN_POINTER_TYPE@[79; 111)
-      ABI@[79; 89)
-        EXTERN_KW@[79; 85) "extern"
-        WHITESPACE@[85; 86) " "
-        STRING@[86; 89) "\"C\""
-      WHITESPACE@[89; 90) " "
-      FN_KW@[90; 92) "fn"
-      WHITESPACE@[92; 93) " "
-      PARAM_LIST@[93; 105)
-        L_PAREN@[93; 94) "("
-        WHITESPACE@[94; 95) " "
-        PARAM@[95; 97)
-          PATH_TYPE@[95; 97)
-            PATH@[95; 97)
-              PATH_SEGMENT@[95; 97)
-                NAME_REF@[95; 97)
-                  IDENT@[95; 97) "u8"
-        WHITESPACE@[97; 98) " "
-        COMMA@[98; 99) ","
-        WHITESPACE@[99; 100) " "
-        PARAM@[100; 103)
-          DOT3@[100; 103) "..."
-        WHITESPACE@[103; 104) " "
-        R_PAREN@[104; 105) ")"
-      WHITESPACE@[105; 106) " "
-      RET_TYPE@[106; 111)
-        THIN_ARROW@[106; 108) "->"
-        WHITESPACE@[108; 109) " "
-        PATH_TYPE@[109; 111)
-          PATH@[109; 111)
-            PATH_SEGMENT@[109; 111)
-              NAME_REF@[109; 111)
-                IDENT@[109; 111) "u8"
-    SEMICOLON@[111; 112) ";"
-  WHITESPACE@[112; 113) "\n"
+SOURCE_FILE@0..113
+  TYPE_ALIAS_DEF@0..14
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    FN_POINTER_TYPE@9..13
+      FN_KW@9..11 "fn"
+      PARAM_LIST@11..13
+        L_PAREN@11..12 "("
+        R_PAREN@12..13 ")"
+    SEMICOLON@13..14 ";"
+  WHITESPACE@14..15 "\n"
+  TYPE_ALIAS_DEF@15..36
+    TYPE_KW@15..19 "type"
+    WHITESPACE@19..20 " "
+    NAME@20..21
+      IDENT@20..21 "B"
+    WHITESPACE@21..22 " "
+    EQ@22..23 "="
+    WHITESPACE@23..24 " "
+    FN_POINTER_TYPE@24..35
+      UNSAFE_KW@24..30 "unsafe"
+      WHITESPACE@30..31 " "
+      FN_KW@31..33 "fn"
+      PARAM_LIST@33..35
+        L_PAREN@33..34 "("
+        R_PAREN@34..35 ")"
+    SEMICOLON@35..36 ";"
+  WHITESPACE@36..37 "\n"
+  TYPE_ALIAS_DEF@37..69
+    TYPE_KW@37..41 "type"
+    WHITESPACE@41..42 " "
+    NAME@42..43
+      IDENT@42..43 "C"
+    WHITESPACE@43..44 " "
+    EQ@44..45 "="
+    WHITESPACE@45..46 " "
+    FN_POINTER_TYPE@46..68
+      UNSAFE_KW@46..52 "unsafe"
+      WHITESPACE@52..53 " "
+      ABI@53..63
+        EXTERN_KW@53..59 "extern"
+        WHITESPACE@59..60 " "
+        STRING@60..63 "\"C\""
+      WHITESPACE@63..64 " "
+      FN_KW@64..66 "fn"
+      PARAM_LIST@66..68
+        L_PAREN@66..67 "("
+        R_PAREN@67..68 ")"
+    SEMICOLON@68..69 ";"
+  WHITESPACE@69..70 "\n"
+  TYPE_ALIAS_DEF@70..112
+    TYPE_KW@70..74 "type"
+    WHITESPACE@74..75 " "
+    NAME@75..76
+      IDENT@75..76 "D"
+    WHITESPACE@76..77 " "
+    EQ@77..78 "="
+    WHITESPACE@78..79 " "
+    FN_POINTER_TYPE@79..111
+      ABI@79..89
+        EXTERN_KW@79..85 "extern"
+        WHITESPACE@85..86 " "
+        STRING@86..89 "\"C\""
+      WHITESPACE@89..90 " "
+      FN_KW@90..92 "fn"
+      WHITESPACE@92..93 " "
+      PARAM_LIST@93..105
+        L_PAREN@93..94 "("
+        WHITESPACE@94..95 " "
+        PARAM@95..97
+          PATH_TYPE@95..97
+            PATH@95..97
+              PATH_SEGMENT@95..97
+                NAME_REF@95..97
+                  IDENT@95..97 "u8"
+        WHITESPACE@97..98 " "
+        COMMA@98..99 ","
+        WHITESPACE@99..100 " "
+        PARAM@100..103
+          DOT3@100..103 "..."
+        WHITESPACE@103..104 " "
+        R_PAREN@104..105 ")"
+      WHITESPACE@105..106 " "
+      RET_TYPE@106..111
+        THIN_ARROW@106..108 "->"
+        WHITESPACE@108..109 " "
+        PATH_TYPE@109..111
+          PATH@109..111
+            PATH_SEGMENT@109..111
+              NAME_REF@109..111
+                IDENT@109..111 "u8"
+    SEMICOLON@111..112 ";"
+  WHITESPACE@112..113 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index e6ee20b9a..784fbb592 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
@@ -1,50 +1,50 @@
-SOURCE_FILE@[0; 54)
-  TYPE_ALIAS_DEF@[0; 13)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    REFERENCE_TYPE@[9; 12)
-      AMP@[9; 10) "&"
-      TUPLE_TYPE@[10; 12)
-        L_PAREN@[10; 11) "("
-        R_PAREN@[11; 12) ")"
-    SEMICOLON@[12; 13) ";"
-  WHITESPACE@[13; 14) "\n"
-  TYPE_ALIAS_DEF@[14; 35)
-    TYPE_KW@[14; 18) "type"
-    WHITESPACE@[18; 19) " "
-    NAME@[19; 20)
-      IDENT@[19; 20) "B"
-    WHITESPACE@[20; 21) " "
-    EQ@[21; 22) "="
-    WHITESPACE@[22; 23) " "
-    REFERENCE_TYPE@[23; 34)
-      AMP@[23; 24) "&"
-      LIFETIME@[24; 31) "\'static"
-      WHITESPACE@[31; 32) " "
-      TUPLE_TYPE@[32; 34)
-        L_PAREN@[32; 33) "("
-        R_PAREN@[33; 34) ")"
-    SEMICOLON@[34; 35) ";"
-  WHITESPACE@[35; 36) "\n"
-  TYPE_ALIAS_DEF@[36; 53)
-    TYPE_KW@[36; 40) "type"
-    WHITESPACE@[40; 41) " "
-    NAME@[41; 42)
-      IDENT@[41; 42) "C"
-    WHITESPACE@[42; 43) " "
-    EQ@[43; 44) "="
-    WHITESPACE@[44; 45) " "
-    REFERENCE_TYPE@[45; 52)
-      AMP@[45; 46) "&"
-      MUT_KW@[46; 49) "mut"
-      WHITESPACE@[49; 50) " "
-      TUPLE_TYPE@[50; 52)
-        L_PAREN@[50; 51) "("
-        R_PAREN@[51; 52) ")"
-    SEMICOLON@[52; 53) ";"
-  WHITESPACE@[53; 54) "\n"
+SOURCE_FILE@0..54
+  TYPE_ALIAS_DEF@0..13
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    REFERENCE_TYPE@9..12
+      AMP@9..10 "&"
+      TUPLE_TYPE@10..12
+        L_PAREN@10..11 "("
+        R_PAREN@11..12 ")"
+    SEMICOLON@12..13 ";"
+  WHITESPACE@13..14 "\n"
+  TYPE_ALIAS_DEF@14..35
+    TYPE_KW@14..18 "type"
+    WHITESPACE@18..19 " "
+    NAME@19..20
+      IDENT@19..20 "B"
+    WHITESPACE@20..21 " "
+    EQ@21..22 "="
+    WHITESPACE@22..23 " "
+    REFERENCE_TYPE@23..34
+      AMP@23..24 "&"
+      LIFETIME@24..31 "\'static"
+      WHITESPACE@31..32 " "
+      TUPLE_TYPE@32..34
+        L_PAREN@32..33 "("
+        R_PAREN@33..34 ")"
+    SEMICOLON@34..35 ";"
+  WHITESPACE@35..36 "\n"
+  TYPE_ALIAS_DEF@36..53
+    TYPE_KW@36..40 "type"
+    WHITESPACE@40..41 " "
+    NAME@41..42
+      IDENT@41..42 "C"
+    WHITESPACE@42..43 " "
+    EQ@43..44 "="
+    WHITESPACE@44..45 " "
+    REFERENCE_TYPE@45..52
+      AMP@45..46 "&"
+      MUT_KW@46..49 "mut"
+      WHITESPACE@49..50 " "
+      TUPLE_TYPE@50..52
+        L_PAREN@50..51 "("
+        R_PAREN@51..52 ")"
+    SEMICOLON@52..53 ";"
+  WHITESPACE@53..54 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
index 4bb95314f..52644da8f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -1,55 +1,55 @@
-SOURCE_FILE@[0; 102)
-  FN_DEF@[0; 101)
-    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; 101)
-      BLOCK@[9; 101)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LOOP_EXPR@[15; 99)
-          LOOP_KW@[15; 19) "loop"
-          WHITESPACE@[19; 20) " "
-          BLOCK_EXPR@[20; 99)
-            BLOCK@[20; 99)
-              L_CURLY@[20; 21) "{"
-              WHITESPACE@[21; 30) "\n        "
-              EXPR_STMT@[30; 36)
-                BREAK_EXPR@[30; 35)
-                  BREAK_KW@[30; 35) "break"
-                SEMICOLON@[35; 36) ";"
-              WHITESPACE@[36; 45) "\n        "
-              EXPR_STMT@[45; 54)
-                BREAK_EXPR@[45; 53)
-                  BREAK_KW@[45; 50) "break"
-                  WHITESPACE@[50; 51) " "
-                  LIFETIME@[51; 53) "\'l"
-                SEMICOLON@[53; 54) ";"
-              WHITESPACE@[54; 63) "\n        "
-              EXPR_STMT@[63; 72)
-                BREAK_EXPR@[63; 71)
-                  BREAK_KW@[63; 68) "break"
-                  WHITESPACE@[68; 69) " "
-                  LITERAL@[69; 71)
-                    INT_NUMBER@[69; 71) "92"
-                SEMICOLON@[71; 72) ";"
-              WHITESPACE@[72; 81) "\n        "
-              EXPR_STMT@[81; 93)
-                BREAK_EXPR@[81; 92)
-                  BREAK_KW@[81; 86) "break"
-                  WHITESPACE@[86; 87) " "
-                  LIFETIME@[87; 89) "\'l"
-                  WHITESPACE@[89; 90) " "
-                  LITERAL@[90; 92)
-                    INT_NUMBER@[90; 92) "92"
-                SEMICOLON@[92; 93) ";"
-              WHITESPACE@[93; 98) "\n    "
-              R_CURLY@[98; 99) "}"
-        WHITESPACE@[99; 100) "\n"
-        R_CURLY@[100; 101) "}"
-  WHITESPACE@[101; 102) "\n"
+SOURCE_FILE@0..102
+  FN_DEF@0..101
+    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..101
+      BLOCK@9..101
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LOOP_EXPR@15..99
+          LOOP_KW@15..19 "loop"
+          WHITESPACE@19..20 " "
+          BLOCK_EXPR@20..99
+            BLOCK@20..99
+              L_CURLY@20..21 "{"
+              WHITESPACE@21..30 "\n        "
+              EXPR_STMT@30..36
+                BREAK_EXPR@30..35
+                  BREAK_KW@30..35 "break"
+                SEMICOLON@35..36 ";"
+              WHITESPACE@36..45 "\n        "
+              EXPR_STMT@45..54
+                BREAK_EXPR@45..53
+                  BREAK_KW@45..50 "break"
+                  WHITESPACE@50..51 " "
+                  LIFETIME@51..53 "\'l"
+                SEMICOLON@53..54 ";"
+              WHITESPACE@54..63 "\n        "
+              EXPR_STMT@63..72
+                BREAK_EXPR@63..71
+                  BREAK_KW@63..68 "break"
+                  WHITESPACE@68..69 " "
+                  LITERAL@69..71
+                    INT_NUMBER@69..71 "92"
+                SEMICOLON@71..72 ";"
+              WHITESPACE@72..81 "\n        "
+              EXPR_STMT@81..93
+                BREAK_EXPR@81..92
+                  BREAK_KW@81..86 "break"
+                  WHITESPACE@86..87 " "
+                  LIFETIME@87..89 "\'l"
+                  WHITESPACE@89..90 " "
+                  LITERAL@90..92
+                    INT_NUMBER@90..92 "92"
+                SEMICOLON@92..93 ";"
+              WHITESPACE@93..98 "\n    "
+              R_CURLY@98..99 "}"
+        WHITESPACE@99..100 "\n"
+        R_CURLY@100..101 "}"
+  WHITESPACE@101..102 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
index a7dfe167c..f061c0cac 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
@@ -1,22 +1,22 @@
-SOURCE_FILE@[0; 30)
-  FN_DEF@[0; 29)
-    UNSAFE_KW@[0; 6) "unsafe"
-    WHITESPACE@[6; 7) " "
-    ABI@[7; 17)
-      EXTERN_KW@[7; 13) "extern"
-      WHITESPACE@[13; 14) " "
-      STRING@[14; 17) "\"C\""
-    WHITESPACE@[17; 18) " "
-    FN_KW@[18; 20) "fn"
-    WHITESPACE@[20; 21) " "
-    NAME@[21; 24)
-      IDENT@[21; 24) "foo"
-    PARAM_LIST@[24; 26)
-      L_PAREN@[24; 25) "("
-      R_PAREN@[25; 26) ")"
-    WHITESPACE@[26; 27) " "
-    BLOCK_EXPR@[27; 29)
-      BLOCK@[27; 29)
-        L_CURLY@[27; 28) "{"
-        R_CURLY@[28; 29) "}"
-  WHITESPACE@[29; 30) "\n"
+SOURCE_FILE@0..30
+  FN_DEF@0..29
+    UNSAFE_KW@0..6 "unsafe"
+    WHITESPACE@6..7 " "
+    ABI@7..17
+      EXTERN_KW@7..13 "extern"
+      WHITESPACE@13..14 " "
+      STRING@14..17 "\"C\""
+    WHITESPACE@17..18 " "
+    FN_KW@18..20 "fn"
+    WHITESPACE@20..21 " "
+    NAME@21..24
+      IDENT@21..24 "foo"
+    PARAM_LIST@24..26
+      L_PAREN@24..25 "("
+      R_PAREN@25..26 ")"
+    WHITESPACE@26..27 " "
+    BLOCK_EXPR@27..29
+      BLOCK@27..29
+        L_CURLY@27..28 "{"
+        R_CURLY@28..29 "}"
+  WHITESPACE@29..30 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index 1cd7a443f..e25fc8c3e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
@@ -1,79 +1,79 @@
-SOURCE_FILE@[0; 71)
-  TYPE_ALIAS_DEF@[0; 26)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "X"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    PATH_TYPE@[9; 25)
-      PATH@[9; 25)
-        PATH@[9; 17)
-          PATH_SEGMENT@[9; 17)
-            L_ANGLE@[9; 10) "<"
-            PATH_TYPE@[10; 11)
-              PATH@[10; 11)
-                PATH_SEGMENT@[10; 11)
-                  NAME_REF@[10; 11)
-                    IDENT@[10; 11) "A"
-            WHITESPACE@[11; 12) " "
-            AS_KW@[12; 14) "as"
-            WHITESPACE@[14; 15) " "
-            PATH_TYPE@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "B"
-            R_ANGLE@[16; 17) ">"
-        COLON2@[17; 19) "::"
-        PATH_SEGMENT@[19; 25)
-          NAME_REF@[19; 25)
-            IDENT@[19; 25) "Output"
-    SEMICOLON@[25; 26) ";"
-  WHITESPACE@[26; 27) "\n"
-  FN_DEF@[27; 70)
-    FN_KW@[27; 29) "fn"
-    WHITESPACE@[29; 30) " "
-    NAME@[30; 33)
-      IDENT@[30; 33) "foo"
-    PARAM_LIST@[33; 35)
-      L_PAREN@[33; 34) "("
-      R_PAREN@[34; 35) ")"
-    WHITESPACE@[35; 36) " "
-    BLOCK_EXPR@[36; 70)
-      BLOCK@[36; 70)
-        L_CURLY@[36; 37) "{"
-        WHITESPACE@[37; 38) " "
-        EXPR_STMT@[38; 68)
-          CALL_EXPR@[38; 67)
-            PATH_EXPR@[38; 65)
-              PATH@[38; 65)
-                PATH@[38; 56)
-                  PATH_SEGMENT@[38; 56)
-                    L_ANGLE@[38; 39) "<"
-                    PATH_TYPE@[39; 44)
-                      PATH@[39; 44)
-                        PATH_SEGMENT@[39; 44)
-                          NAME_REF@[39; 44)
-                            IDENT@[39; 44) "usize"
-                    WHITESPACE@[44; 45) " "
-                    AS_KW@[45; 47) "as"
-                    WHITESPACE@[47; 48) " "
-                    PATH_TYPE@[48; 55)
-                      PATH@[48; 55)
-                        PATH_SEGMENT@[48; 55)
-                          NAME_REF@[48; 55)
-                            IDENT@[48; 55) "Default"
-                    R_ANGLE@[55; 56) ">"
-                COLON2@[56; 58) "::"
-                PATH_SEGMENT@[58; 65)
-                  NAME_REF@[58; 65)
-                    IDENT@[58; 65) "default"
-            ARG_LIST@[65; 67)
-              L_PAREN@[65; 66) "("
-              R_PAREN@[66; 67) ")"
-          SEMICOLON@[67; 68) ";"
-        WHITESPACE@[68; 69) " "
-        R_CURLY@[69; 70) "}"
-  WHITESPACE@[70; 71) "\n"
+SOURCE_FILE@0..71
+  TYPE_ALIAS_DEF@0..26
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "X"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..25
+      PATH@9..25
+        PATH@9..17
+          PATH_SEGMENT@9..17
+            L_ANGLE@9..10 "<"
+            PATH_TYPE@10..11
+              PATH@10..11
+                PATH_SEGMENT@10..11
+                  NAME_REF@10..11
+                    IDENT@10..11 "A"
+            WHITESPACE@11..12 " "
+            AS_KW@12..14 "as"
+            WHITESPACE@14..15 " "
+            PATH_TYPE@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "B"
+            R_ANGLE@16..17 ">"
+        COLON2@17..19 "::"
+        PATH_SEGMENT@19..25
+          NAME_REF@19..25
+            IDENT@19..25 "Output"
+    SEMICOLON@25..26 ";"
+  WHITESPACE@26..27 "\n"
+  FN_DEF@27..70
+    FN_KW@27..29 "fn"
+    WHITESPACE@29..30 " "
+    NAME@30..33
+      IDENT@30..33 "foo"
+    PARAM_LIST@33..35
+      L_PAREN@33..34 "("
+      R_PAREN@34..35 ")"
+    WHITESPACE@35..36 " "
+    BLOCK_EXPR@36..70
+      BLOCK@36..70
+        L_CURLY@36..37 "{"
+        WHITESPACE@37..38 " "
+        EXPR_STMT@38..68
+          CALL_EXPR@38..67
+            PATH_EXPR@38..65
+              PATH@38..65
+                PATH@38..56
+                  PATH_SEGMENT@38..56
+                    L_ANGLE@38..39 "<"
+                    PATH_TYPE@39..44
+                      PATH@39..44
+                        PATH_SEGMENT@39..44
+                          NAME_REF@39..44
+                            IDENT@39..44 "usize"
+                    WHITESPACE@44..45 " "
+                    AS_KW@45..47 "as"
+                    WHITESPACE@47..48 " "
+                    PATH_TYPE@48..55
+                      PATH@48..55
+                        PATH_SEGMENT@48..55
+                          NAME_REF@48..55
+                            IDENT@48..55 "Default"
+                    R_ANGLE@55..56 ">"
+                COLON2@56..58 "::"
+                PATH_SEGMENT@58..65
+                  NAME_REF@58..65
+                    IDENT@58..65 "default"
+            ARG_LIST@65..67
+              L_PAREN@65..66 "("
+              R_PAREN@66..67 ")"
+          SEMICOLON@67..68 ";"
+        WHITESPACE@68..69 " "
+        R_CURLY@69..70 "}"
+  WHITESPACE@70..71 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index f5db5a9e6..a1238d610 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
@@ -1,29 +1,29 @@
-SOURCE_FILE@[0; 21)
-  FN_DEF@[0; 20)
-    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; 20)
-      BLOCK@[9; 20)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) " "
-        EXPR_STMT@[11; 18)
-          INDEX_EXPR@[11; 17)
-            PATH_EXPR@[11; 13)
-              PATH@[11; 13)
-                PATH_SEGMENT@[11; 13)
-                  NAME_REF@[11; 13)
-                    IDENT@[11; 13) "xs"
-            L_BRACK@[13; 14) "["
-            RANGE_EXPR@[14; 16)
-              DOT2@[14; 16) ".."
-            R_BRACK@[16; 17) "]"
-          SEMICOLON@[17; 18) ";"
-        WHITESPACE@[18; 19) " "
-        R_CURLY@[19; 20) "}"
-  WHITESPACE@[20; 21) "\n"
+SOURCE_FILE@0..21
+  FN_DEF@0..20
+    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..20
+      BLOCK@9..20
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 " "
+        EXPR_STMT@11..18
+          INDEX_EXPR@11..17
+            PATH_EXPR@11..13
+              PATH@11..13
+                PATH_SEGMENT@11..13
+                  NAME_REF@11..13
+                    IDENT@11..13 "xs"
+            L_BRACK@13..14 "["
+            RANGE_EXPR@14..16
+              DOT2@14..16 ".."
+            R_BRACK@16..17 "]"
+          SEMICOLON@17..18 ";"
+        WHITESPACE@18..19 " "
+        R_CURLY@19..20 "}"
+  WHITESPACE@20..21 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 2d9db61b3..69e5fe4bc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -1,55 +1,55 @@
-SOURCE_FILE@[0; 46)
-  TYPE_ALIAS_DEF@[0; 45)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    PATH_TYPE@[9; 44)
-      PATH@[9; 44)
-        PATH_SEGMENT@[9; 44)
-          NAME_REF@[9; 10)
-            IDENT@[9; 10) "B"
-          TYPE_ARG_LIST@[10; 44)
-            L_ANGLE@[10; 11) "<"
-            LIFETIME_ARG@[11; 18)
-              LIFETIME@[11; 18) "\'static"
-            COMMA@[18; 19) ","
-            WHITESPACE@[19; 20) " "
-            TYPE_ARG@[20; 23)
-              PATH_TYPE@[20; 23)
-                PATH@[20; 23)
-                  PATH_SEGMENT@[20; 23)
-                    NAME_REF@[20; 23)
-                      IDENT@[20; 23) "i32"
-            COMMA@[23; 24) ","
-            WHITESPACE@[24; 25) " "
-            CONST_ARG@[25; 26)
-              INT_NUMBER@[25; 26) "1"
-            COMMA@[26; 27) ","
-            WHITESPACE@[27; 28) " "
-            CONST_ARG@[28; 33)
-              BLOCK_EXPR@[28; 33)
-                BLOCK@[28; 33)
-                  L_CURLY@[28; 29) "{"
-                  WHITESPACE@[29; 30) " "
-                  LITERAL@[30; 31)
-                    INT_NUMBER@[30; 31) "2"
-                  WHITESPACE@[31; 32) " "
-                  R_CURLY@[32; 33) "}"
-            COMMA@[33; 34) ","
-            WHITESPACE@[34; 35) " "
-            ASSOC_TYPE_ARG@[35; 43)
-              NAME_REF@[35; 39)
-                IDENT@[35; 39) "Item"
-              EQ@[39; 40) "="
-              PATH_TYPE@[40; 43)
-                PATH@[40; 43)
-                  PATH_SEGMENT@[40; 43)
-                    NAME_REF@[40; 43)
-                      IDENT@[40; 43) "u64"
-            R_ANGLE@[43; 44) ">"
-    SEMICOLON@[44; 45) ";"
-  WHITESPACE@[45; 46) "\n"
+SOURCE_FILE@0..46
+  TYPE_ALIAS_DEF@0..45
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..44
+      PATH@9..44
+        PATH_SEGMENT@9..44
+          NAME_REF@9..10
+            IDENT@9..10 "B"
+          TYPE_ARG_LIST@10..44
+            L_ANGLE@10..11 "<"
+            LIFETIME_ARG@11..18
+              LIFETIME@11..18 "\'static"
+            COMMA@18..19 ","
+            WHITESPACE@19..20 " "
+            TYPE_ARG@20..23
+              PATH_TYPE@20..23
+                PATH@20..23
+                  PATH_SEGMENT@20..23
+                    NAME_REF@20..23
+                      IDENT@20..23 "i32"
+            COMMA@23..24 ","
+            WHITESPACE@24..25 " "
+            CONST_ARG@25..26
+              INT_NUMBER@25..26 "1"
+            COMMA@26..27 ","
+            WHITESPACE@27..28 " "
+            CONST_ARG@28..33
+              BLOCK_EXPR@28..33
+                BLOCK@28..33
+                  L_CURLY@28..29 "{"
+                  WHITESPACE@29..30 " "
+                  LITERAL@30..31
+                    INT_NUMBER@30..31 "2"
+                  WHITESPACE@31..32 " "
+                  R_CURLY@32..33 "}"
+            COMMA@33..34 ","
+            WHITESPACE@34..35 " "
+            ASSOC_TYPE_ARG@35..43
+              NAME_REF@35..39
+                IDENT@35..39 "Item"
+              EQ@39..40 "="
+              PATH_TYPE@40..43
+                PATH@40..43
+                  PATH_SEGMENT@40..43
+                    NAME_REF@40..43
+                      IDENT@40..43 "u64"
+            R_ANGLE@43..44 ">"
+    SEMICOLON@44..45 ";"
+  WHITESPACE@45..46 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index 4c175e210..1a98e2610 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
@@ -1,63 +1,63 @@
-SOURCE_FILE@[0; 71)
-  FN_DEF@[0; 19)
-    VISIBILITY@[0; 5)
-      CRATE_KW@[0; 5) "crate"
-    WHITESPACE@[5; 6) " "
-    FN_KW@[6; 8) "fn"
-    WHITESPACE@[8; 9) " "
-    NAME@[9; 13)
-      IDENT@[9; 13) "main"
-    PARAM_LIST@[13; 15)
-      L_PAREN@[13; 14) "("
-      R_PAREN@[14; 15) ")"
-    WHITESPACE@[15; 16) " "
-    BLOCK_EXPR@[16; 19)
-      BLOCK@[16; 19)
-        L_CURLY@[16; 17) "{"
-        WHITESPACE@[17; 18) " "
-        R_CURLY@[18; 19) "}"
-  WHITESPACE@[19; 20) "\n"
-  STRUCT_DEF@[20; 49)
-    STRUCT_KW@[20; 26) "struct"
-    WHITESPACE@[26; 27) " "
-    NAME@[27; 28)
-      IDENT@[27; 28) "S"
-    WHITESPACE@[28; 29) " "
-    RECORD_FIELD_DEF_LIST@[29; 49)
-      L_CURLY@[29; 30) "{"
-      WHITESPACE@[30; 31) " "
-      RECORD_FIELD_DEF@[31; 47)
-        VISIBILITY@[31; 36)
-          CRATE_KW@[31; 36) "crate"
-        WHITESPACE@[36; 37) " "
-        NAME@[37; 42)
-          IDENT@[37; 42) "field"
-        COLON@[42; 43) ":"
-        WHITESPACE@[43; 44) " "
-        PATH_TYPE@[44; 47)
-          PATH@[44; 47)
-            PATH_SEGMENT@[44; 47)
-              NAME_REF@[44; 47)
-                IDENT@[44; 47) "u32"
-      WHITESPACE@[47; 48) " "
-      R_CURLY@[48; 49) "}"
-  WHITESPACE@[49; 50) "\n"
-  STRUCT_DEF@[50; 70)
-    STRUCT_KW@[50; 56) "struct"
-    WHITESPACE@[56; 57) " "
-    NAME@[57; 58)
-      IDENT@[57; 58) "T"
-    TUPLE_FIELD_DEF_LIST@[58; 69)
-      L_PAREN@[58; 59) "("
-      TUPLE_FIELD_DEF@[59; 68)
-        VISIBILITY@[59; 64)
-          CRATE_KW@[59; 64) "crate"
-        WHITESPACE@[64; 65) " "
-        PATH_TYPE@[65; 68)
-          PATH@[65; 68)
-            PATH_SEGMENT@[65; 68)
-              NAME_REF@[65; 68)
-                IDENT@[65; 68) "u32"
-      R_PAREN@[68; 69) ")"
-    SEMICOLON@[69; 70) ";"
-  WHITESPACE@[70; 71) "\n"
+SOURCE_FILE@0..71
+  FN_DEF@0..19
+    VISIBILITY@0..5
+      CRATE_KW@0..5 "crate"
+    WHITESPACE@5..6 " "
+    FN_KW@6..8 "fn"
+    WHITESPACE@8..9 " "
+    NAME@9..13
+      IDENT@9..13 "main"
+    PARAM_LIST@13..15
+      L_PAREN@13..14 "("
+      R_PAREN@14..15 ")"
+    WHITESPACE@15..16 " "
+    BLOCK_EXPR@16..19
+      BLOCK@16..19
+        L_CURLY@16..17 "{"
+        WHITESPACE@17..18 " "
+        R_CURLY@18..19 "}"
+  WHITESPACE@19..20 "\n"
+  STRUCT_DEF@20..49
+    STRUCT_KW@20..26 "struct"
+    WHITESPACE@26..27 " "
+    NAME@27..28
+      IDENT@27..28 "S"
+    WHITESPACE@28..29 " "
+    RECORD_FIELD_DEF_LIST@29..49
+      L_CURLY@29..30 "{"
+      WHITESPACE@30..31 " "
+      RECORD_FIELD_DEF@31..47
+        VISIBILITY@31..36
+          CRATE_KW@31..36 "crate"
+        WHITESPACE@36..37 " "
+        NAME@37..42
+          IDENT@37..42 "field"
+        COLON@42..43 ":"
+        WHITESPACE@43..44 " "
+        PATH_TYPE@44..47
+          PATH@44..47
+            PATH_SEGMENT@44..47
+              NAME_REF@44..47
+                IDENT@44..47 "u32"
+      WHITESPACE@47..48 " "
+      R_CURLY@48..49 "}"
+  WHITESPACE@49..50 "\n"
+  STRUCT_DEF@50..70
+    STRUCT_KW@50..56 "struct"
+    WHITESPACE@56..57 " "
+    NAME@57..58
+      IDENT@57..58 "T"
+    TUPLE_FIELD_DEF_LIST@58..69
+      L_PAREN@58..59 "("
+      TUPLE_FIELD_DEF@59..68
+        VISIBILITY@59..64
+          CRATE_KW@59..64 "crate"
+        WHITESPACE@64..65 " "
+        PATH_TYPE@65..68
+          PATH@65..68
+            PATH_SEGMENT@65..68
+              NAME_REF@65..68
+                IDENT@65..68 "u32"
+      R_PAREN@68..69 ")"
+    SEMICOLON@69..70 ";"
+  WHITESPACE@70..71 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
index 578361715..1ae791361 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
@@ -1,125 +1,125 @@
-SOURCE_FILE@[0; 101)
-  TRAIT_DEF@[0; 41)
-    TRAIT_KW@[0; 5) "trait"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 7)
-      IDENT@[6; 7) "T"
-    TYPE_PARAM_LIST@[7; 10)
-      L_ANGLE@[7; 8) "<"
-      TYPE_PARAM@[8; 9)
-        NAME@[8; 9)
-          IDENT@[8; 9) "U"
-      R_ANGLE@[9; 10) ">"
-    COLON@[10; 11) ":"
-    WHITESPACE@[11; 12) " "
-    TYPE_BOUND_LIST@[12; 24)
-      TYPE_BOUND@[12; 16)
-        PATH_TYPE@[12; 16)
-          PATH@[12; 16)
-            PATH_SEGMENT@[12; 16)
-              NAME_REF@[12; 16)
-                IDENT@[12; 16) "Hash"
-      WHITESPACE@[16; 17) " "
-      PLUS@[17; 18) "+"
-      WHITESPACE@[18; 19) " "
-      TYPE_BOUND@[19; 24)
-        PATH_TYPE@[19; 24)
-          PATH@[19; 24)
-            PATH_SEGMENT@[19; 24)
-              NAME_REF@[19; 24)
-                IDENT@[19; 24) "Clone"
-    WHITESPACE@[24; 25) " "
-    WHERE_CLAUSE@[25; 38)
-      WHERE_KW@[25; 30) "where"
-      WHITESPACE@[30; 31) " "
-      WHERE_PRED@[31; 38)
-        PATH_TYPE@[31; 32)
-          PATH@[31; 32)
-            PATH_SEGMENT@[31; 32)
-              NAME_REF@[31; 32)
-                IDENT@[31; 32) "U"
-        COLON@[32; 33) ":"
-        WHITESPACE@[33; 34) " "
-        TYPE_BOUND_LIST@[34; 38)
-          TYPE_BOUND@[34; 38)
-            PATH_TYPE@[34; 38)
-              PATH@[34; 38)
-                PATH_SEGMENT@[34; 38)
-                  NAME_REF@[34; 38)
-                    IDENT@[34; 38) "Copy"
-    WHITESPACE@[38; 39) " "
-    ITEM_LIST@[39; 41)
-      L_CURLY@[39; 40) "{"
-      R_CURLY@[40; 41) "}"
-  WHITESPACE@[41; 42) "\n"
-  TRAIT_DEF@[42; 100)
-    TRAIT_KW@[42; 47) "trait"
-    WHITESPACE@[47; 48) " "
-    NAME@[48; 49)
-      IDENT@[48; 49) "X"
-    TYPE_PARAM_LIST@[49; 69)
-      L_ANGLE@[49; 50) "<"
-      TYPE_PARAM@[50; 68)
-        NAME@[50; 51)
-          IDENT@[50; 51) "U"
-        COLON@[51; 52) ":"
-        WHITESPACE@[52; 53) " "
-        TYPE_BOUND_LIST@[53; 68)
-          TYPE_BOUND@[53; 58)
-            PATH_TYPE@[53; 58)
-              PATH@[53; 58)
-                PATH_SEGMENT@[53; 58)
-                  NAME_REF@[53; 58)
-                    IDENT@[53; 58) "Debug"
-          WHITESPACE@[58; 59) " "
-          PLUS@[59; 60) "+"
-          WHITESPACE@[60; 61) " "
-          TYPE_BOUND@[61; 68)
-            PATH_TYPE@[61; 68)
-              PATH@[61; 68)
-                PATH_SEGMENT@[61; 68)
-                  NAME_REF@[61; 68)
-                    IDENT@[61; 68) "Display"
-      R_ANGLE@[68; 69) ">"
-    COLON@[69; 70) ":"
-    WHITESPACE@[70; 71) " "
-    TYPE_BOUND_LIST@[71; 83)
-      TYPE_BOUND@[71; 75)
-        PATH_TYPE@[71; 75)
-          PATH@[71; 75)
-            PATH_SEGMENT@[71; 75)
-              NAME_REF@[71; 75)
-                IDENT@[71; 75) "Hash"
-      WHITESPACE@[75; 76) " "
-      PLUS@[76; 77) "+"
-      WHITESPACE@[77; 78) " "
-      TYPE_BOUND@[78; 83)
-        PATH_TYPE@[78; 83)
-          PATH@[78; 83)
-            PATH_SEGMENT@[78; 83)
-              NAME_REF@[78; 83)
-                IDENT@[78; 83) "Clone"
-    WHITESPACE@[83; 84) " "
-    WHERE_CLAUSE@[84; 97)
-      WHERE_KW@[84; 89) "where"
-      WHITESPACE@[89; 90) " "
-      WHERE_PRED@[90; 97)
-        PATH_TYPE@[90; 91)
-          PATH@[90; 91)
-            PATH_SEGMENT@[90; 91)
-              NAME_REF@[90; 91)
-                IDENT@[90; 91) "U"
-        COLON@[91; 92) ":"
-        WHITESPACE@[92; 93) " "
-        TYPE_BOUND_LIST@[93; 97)
-          TYPE_BOUND@[93; 97)
-            PATH_TYPE@[93; 97)
-              PATH@[93; 97)
-                PATH_SEGMENT@[93; 97)
-                  NAME_REF@[93; 97)
-                    IDENT@[93; 97) "Copy"
-    WHITESPACE@[97; 98) " "
-    ITEM_LIST@[98; 100)
-      L_CURLY@[98; 99) "{"
-      R_CURLY@[99; 100) "}"
-  WHITESPACE@[100; 101) "\n"
+SOURCE_FILE@0..101
+  TRAIT_DEF@0..41
+    TRAIT_KW@0..5 "trait"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "T"
+    TYPE_PARAM_LIST@7..10
+      L_ANGLE@7..8 "<"
+      TYPE_PARAM@8..9
+        NAME@8..9
+          IDENT@8..9 "U"
+      R_ANGLE@9..10 ">"
+    COLON@10..11 ":"
+    WHITESPACE@11..12 " "
+    TYPE_BOUND_LIST@12..24
+      TYPE_BOUND@12..16
+        PATH_TYPE@12..16
+          PATH@12..16
+            PATH_SEGMENT@12..16
+              NAME_REF@12..16
+                IDENT@12..16 "Hash"
+      WHITESPACE@16..17 " "
+      PLUS@17..18 "+"
+      WHITESPACE@18..19 " "
+      TYPE_BOUND@19..24
+        PATH_TYPE@19..24
+          PATH@19..24
+            PATH_SEGMENT@19..24
+              NAME_REF@19..24
+                IDENT@19..24 "Clone"
+    WHITESPACE@24..25 " "
+    WHERE_CLAUSE@25..38
+      WHERE_KW@25..30 "where"
+      WHITESPACE@30..31 " "
+      WHERE_PRED@31..38
+        PATH_TYPE@31..32
+          PATH@31..32
+            PATH_SEGMENT@31..32
+              NAME_REF@31..32
+                IDENT@31..32 "U"
+        COLON@32..33 ":"
+        WHITESPACE@33..34 " "
+        TYPE_BOUND_LIST@34..38
+          TYPE_BOUND@34..38
+            PATH_TYPE@34..38
+              PATH@34..38
+                PATH_SEGMENT@34..38
+                  NAME_REF@34..38
+                    IDENT@34..38 "Copy"
+    WHITESPACE@38..39 " "
+    ITEM_LIST@39..41
+      L_CURLY@39..40 "{"
+      R_CURLY@40..41 "}"
+  WHITESPACE@41..42 "\n"
+  TRAIT_DEF@42..100
+    TRAIT_KW@42..47 "trait"
+    WHITESPACE@47..48 " "
+    NAME@48..49
+      IDENT@48..49 "X"
+    TYPE_PARAM_LIST@49..69
+      L_ANGLE@49..50 "<"
+      TYPE_PARAM@50..68
+        NAME@50..51
+          IDENT@50..51 "U"
+        COLON@51..52 ":"
+        WHITESPACE@52..53 " "
+        TYPE_BOUND_LIST@53..68
+          TYPE_BOUND@53..58
+            PATH_TYPE@53..58
+              PATH@53..58
+                PATH_SEGMENT@53..58
+                  NAME_REF@53..58
+                    IDENT@53..58 "Debug"
+          WHITESPACE@58..59 " "
+          PLUS@59..60 "+"
+          WHITESPACE@60..61 " "
+          TYPE_BOUND@61..68
+            PATH_TYPE@61..68
+              PATH@61..68
+                PATH_SEGMENT@61..68
+                  NAME_REF@61..68
+                    IDENT@61..68 "Display"
+      R_ANGLE@68..69 ">"
+    COLON@69..70 ":"
+    WHITESPACE@70..71 " "
+    TYPE_BOUND_LIST@71..83
+      TYPE_BOUND@71..75
+        PATH_TYPE@71..75
+          PATH@71..75
+            PATH_SEGMENT@71..75
+              NAME_REF@71..75
+                IDENT@71..75 "Hash"
+      WHITESPACE@75..76 " "
+      PLUS@76..77 "+"
+      WHITESPACE@77..78 " "
+      TYPE_BOUND@78..83
+        PATH_TYPE@78..83
+          PATH@78..83
+            PATH_SEGMENT@78..83
+              NAME_REF@78..83
+                IDENT@78..83 "Clone"
+    WHITESPACE@83..84 " "
+    WHERE_CLAUSE@84..97
+      WHERE_KW@84..89 "where"
+      WHITESPACE@89..90 " "
+      WHERE_PRED@90..97
+        PATH_TYPE@90..91
+          PATH@90..91
+            PATH_SEGMENT@90..91
+              NAME_REF@90..91
+                IDENT@90..91 "U"
+        COLON@91..92 ":"
+        WHITESPACE@92..93 " "
+        TYPE_BOUND_LIST@93..97
+          TYPE_BOUND@93..97
+            PATH_TYPE@93..97
+              PATH@93..97
+                PATH_SEGMENT@93..97
+                  NAME_REF@93..97
+                    IDENT@93..97 "Copy"
+    WHITESPACE@97..98 " "
+    ITEM_LIST@98..100
+      L_CURLY@98..99 "{"
+      R_CURLY@99..100 "}"
+  WHITESPACE@100..101 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
index f9e677a03..bbf6dc494 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
@@ -1,148 +1,148 @@
-SOURCE_FILE@[0; 118)
-  FN_DEF@[0; 117)
-    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; 117)
-      BLOCK@[9; 117)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 27)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          CALL_EXPR@[23; 26)
-            PATH_EXPR@[23; 24)
-              PATH@[23; 24)
-                PATH_SEGMENT@[23; 24)
-                  NAME_REF@[23; 24)
-                    IDENT@[23; 24) "f"
-            ARG_LIST@[24; 26)
-              L_PAREN@[24; 25) "("
-              R_PAREN@[25; 26) ")"
-          SEMICOLON@[26; 27) ";"
-        WHITESPACE@[27; 32) "\n    "
-        LET_STMT@[32; 54)
-          LET_KW@[32; 35) "let"
-          WHITESPACE@[35; 36) " "
-          PLACEHOLDER_PAT@[36; 37)
-            UNDERSCORE@[36; 37) "_"
-          WHITESPACE@[37; 38) " "
-          EQ@[38; 39) "="
-          WHITESPACE@[39; 40) " "
-          CALL_EXPR@[40; 53)
-            CALL_EXPR@[40; 46)
-              CALL_EXPR@[40; 43)
-                PATH_EXPR@[40; 41)
-                  PATH@[40; 41)
-                    PATH_SEGMENT@[40; 41)
-                      NAME_REF@[40; 41)
-                        IDENT@[40; 41) "f"
-                ARG_LIST@[41; 43)
-                  L_PAREN@[41; 42) "("
-                  R_PAREN@[42; 43) ")"
-              ARG_LIST@[43; 46)
-                L_PAREN@[43; 44) "("
-                LITERAL@[44; 45)
-                  INT_NUMBER@[44; 45) "1"
-                R_PAREN@[45; 46) ")"
-            ARG_LIST@[46; 53)
-              L_PAREN@[46; 47) "("
-              LITERAL@[47; 48)
-                INT_NUMBER@[47; 48) "1"
-              COMMA@[48; 49) ","
-              WHITESPACE@[49; 50) " "
-              LITERAL@[50; 51)
-                INT_NUMBER@[50; 51) "2"
-              COMMA@[51; 52) ","
-              R_PAREN@[52; 53) ")"
-          SEMICOLON@[53; 54) ";"
-        WHITESPACE@[54; 59) "\n    "
-        LET_STMT@[59; 84)
-          LET_KW@[59; 62) "let"
-          WHITESPACE@[62; 63) " "
-          PLACEHOLDER_PAT@[63; 64)
-            UNDERSCORE@[63; 64) "_"
-          WHITESPACE@[64; 65) " "
-          EQ@[65; 66) "="
-          WHITESPACE@[66; 67) " "
-          CALL_EXPR@[67; 83)
-            PATH_EXPR@[67; 68)
-              PATH@[67; 68)
-                PATH_SEGMENT@[67; 68)
-                  NAME_REF@[67; 68)
-                    IDENT@[67; 68) "f"
-            ARG_LIST@[68; 83)
-              L_PAREN@[68; 69) "("
-              CALL_EXPR@[69; 82)
-                PATH_EXPR@[69; 80)
-                  PATH@[69; 80)
-                    PATH@[69; 74)
-                      PATH_SEGMENT@[69; 74)
-                        L_ANGLE@[69; 70) "<"
-                        PATH_TYPE@[70; 73)
-                          PATH@[70; 73)
-                            PATH_SEGMENT@[70; 73)
-                              NAME_REF@[70; 73)
-                                IDENT@[70; 73) "Foo"
-                        R_ANGLE@[73; 74) ">"
-                    COLON2@[74; 76) "::"
-                    PATH_SEGMENT@[76; 80)
-                      NAME_REF@[76; 80)
-                        IDENT@[76; 80) "func"
-                ARG_LIST@[80; 82)
-                  L_PAREN@[80; 81) "("
-                  R_PAREN@[81; 82) ")"
-              R_PAREN@[82; 83) ")"
-          SEMICOLON@[83; 84) ";"
-        WHITESPACE@[84; 89) "\n    "
-        EXPR_STMT@[89; 115)
-          CALL_EXPR@[89; 114)
-            PATH_EXPR@[89; 90)
-              PATH@[89; 90)
-                PATH_SEGMENT@[89; 90)
-                  NAME_REF@[89; 90)
-                    IDENT@[89; 90) "f"
-            ARG_LIST@[90; 114)
-              L_PAREN@[90; 91) "("
-              CALL_EXPR@[91; 113)
-                PATH_EXPR@[91; 111)
-                  PATH@[91; 111)
-                    PATH@[91; 105)
-                      PATH_SEGMENT@[91; 105)
-                        L_ANGLE@[91; 92) "<"
-                        PATH_TYPE@[92; 95)
-                          PATH@[92; 95)
-                            PATH_SEGMENT@[92; 95)
-                              NAME_REF@[92; 95)
-                                IDENT@[92; 95) "Foo"
-                        WHITESPACE@[95; 96) " "
-                        AS_KW@[96; 98) "as"
-                        WHITESPACE@[98; 99) " "
-                        PATH_TYPE@[99; 104)
-                          PATH@[99; 104)
-                            PATH_SEGMENT@[99; 104)
-                              NAME_REF@[99; 104)
-                                IDENT@[99; 104) "Trait"
-                        R_ANGLE@[104; 105) ">"
-                    COLON2@[105; 107) "::"
-                    PATH_SEGMENT@[107; 111)
-                      NAME_REF@[107; 111)
-                        IDENT@[107; 111) "func"
-                ARG_LIST@[111; 113)
-                  L_PAREN@[111; 112) "("
-                  R_PAREN@[112; 113) ")"
-              R_PAREN@[113; 114) ")"
-          SEMICOLON@[114; 115) ";"
-        WHITESPACE@[115; 116) "\n"
-        R_CURLY@[116; 117) "}"
-  WHITESPACE@[117; 118) "\n"
+SOURCE_FILE@0..118
+  FN_DEF@0..117
+    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..117
+      BLOCK@9..117
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..27
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          CALL_EXPR@23..26
+            PATH_EXPR@23..24
+              PATH@23..24
+                PATH_SEGMENT@23..24
+                  NAME_REF@23..24
+                    IDENT@23..24 "f"
+            ARG_LIST@24..26
+              L_PAREN@24..25 "("
+              R_PAREN@25..26 ")"
+          SEMICOLON@26..27 ";"
+        WHITESPACE@27..32 "\n    "
+        LET_STMT@32..54
+          LET_KW@32..35 "let"
+          WHITESPACE@35..36 " "
+          PLACEHOLDER_PAT@36..37
+            UNDERSCORE@36..37 "_"
+          WHITESPACE@37..38 " "
+          EQ@38..39 "="
+          WHITESPACE@39..40 " "
+          CALL_EXPR@40..53
+            CALL_EXPR@40..46
+              CALL_EXPR@40..43
+                PATH_EXPR@40..41
+                  PATH@40..41
+                    PATH_SEGMENT@40..41
+                      NAME_REF@40..41
+                        IDENT@40..41 "f"
+                ARG_LIST@41..43
+                  L_PAREN@41..42 "("
+                  R_PAREN@42..43 ")"
+              ARG_LIST@43..46
+                L_PAREN@43..44 "("
+                LITERAL@44..45
+                  INT_NUMBER@44..45 "1"
+                R_PAREN@45..46 ")"
+            ARG_LIST@46..53
+              L_PAREN@46..47 "("
+              LITERAL@47..48
+                INT_NUMBER@47..48 "1"
+              COMMA@48..49 ","
+              WHITESPACE@49..50 " "
+              LITERAL@50..51
+                INT_NUMBER@50..51 "2"
+              COMMA@51..52 ","
+              R_PAREN@52..53 ")"
+          SEMICOLON@53..54 ";"
+        WHITESPACE@54..59 "\n    "
+        LET_STMT@59..84
+          LET_KW@59..62 "let"
+          WHITESPACE@62..63 " "
+          PLACEHOLDER_PAT@63..64
+            UNDERSCORE@63..64 "_"
+          WHITESPACE@64..65 " "
+          EQ@65..66 "="
+          WHITESPACE@66..67 " "
+          CALL_EXPR@67..83
+            PATH_EXPR@67..68
+              PATH@67..68
+                PATH_SEGMENT@67..68
+                  NAME_REF@67..68
+                    IDENT@67..68 "f"
+            ARG_LIST@68..83
+              L_PAREN@68..69 "("
+              CALL_EXPR@69..82
+                PATH_EXPR@69..80
+                  PATH@69..80
+                    PATH@69..74
+                      PATH_SEGMENT@69..74
+                        L_ANGLE@69..70 "<"
+                        PATH_TYPE@70..73
+                          PATH@70..73
+                            PATH_SEGMENT@70..73
+                              NAME_REF@70..73
+                                IDENT@70..73 "Foo"
+                        R_ANGLE@73..74 ">"
+                    COLON2@74..76 "::"
+                    PATH_SEGMENT@76..80
+                      NAME_REF@76..80
+                        IDENT@76..80 "func"
+                ARG_LIST@80..82
+                  L_PAREN@80..81 "("
+                  R_PAREN@81..82 ")"
+              R_PAREN@82..83 ")"
+          SEMICOLON@83..84 ";"
+        WHITESPACE@84..89 "\n    "
+        EXPR_STMT@89..115
+          CALL_EXPR@89..114
+            PATH_EXPR@89..90
+              PATH@89..90
+                PATH_SEGMENT@89..90
+                  NAME_REF@89..90
+                    IDENT@89..90 "f"
+            ARG_LIST@90..114
+              L_PAREN@90..91 "("
+              CALL_EXPR@91..113
+                PATH_EXPR@91..111
+                  PATH@91..111
+                    PATH@91..105
+                      PATH_SEGMENT@91..105
+                        L_ANGLE@91..92 "<"
+                        PATH_TYPE@92..95
+                          PATH@92..95
+                            PATH_SEGMENT@92..95
+                              NAME_REF@92..95
+                                IDENT@92..95 "Foo"
+                        WHITESPACE@95..96 " "
+                        AS_KW@96..98 "as"
+                        WHITESPACE@98..99 " "
+                        PATH_TYPE@99..104
+                          PATH@99..104
+                            PATH_SEGMENT@99..104
+                              NAME_REF@99..104
+                                IDENT@99..104 "Trait"
+                        R_ANGLE@104..105 ">"
+                    COLON2@105..107 "::"
+                    PATH_SEGMENT@107..111
+                      NAME_REF@107..111
+                        IDENT@107..111 "func"
+                ARG_LIST@111..113
+                  L_PAREN@111..112 "("
+                  R_PAREN@112..113 ")"
+              R_PAREN@113..114 ")"
+          SEMICOLON@114..115 ";"
+        WHITESPACE@115..116 "\n"
+        R_CURLY@116..117 "}"
+  WHITESPACE@117..118 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
index 580f29cfb..f0e09d40d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
@@ -1,138 +1,138 @@
-SOURCE_FILE@[0; 198)
-  USE_ITEM@[0; 28)
-    USE_KW@[0; 3) "use"
-    WHITESPACE@[3; 4) " "
-    USE_TREE@[4; 27)
-      PATH@[4; 14)
-        PATH@[4; 8)
-          PATH_SEGMENT@[4; 8)
-            NAME_REF@[4; 8)
-              IDENT@[4; 8) "some"
-        COLON2@[8; 10) "::"
-        PATH_SEGMENT@[10; 14)
-          NAME_REF@[10; 14)
-            IDENT@[10; 14) "path"
-      WHITESPACE@[14; 15) " "
-      ALIAS@[15; 27)
-        AS_KW@[15; 17) "as"
-        WHITESPACE@[17; 18) " "
-        NAME@[18; 27)
-          IDENT@[18; 27) "some_name"
-    SEMICOLON@[27; 28) ";"
-  WHITESPACE@[28; 29) "\n"
-  USE_ITEM@[29; 181)
-    USE_KW@[29; 32) "use"
-    WHITESPACE@[32; 33) " "
-    USE_TREE@[33; 180)
-      PATH@[33; 37)
-        PATH_SEGMENT@[33; 37)
-          NAME_REF@[33; 37)
-            IDENT@[33; 37) "some"
-      COLON2@[37; 39) "::"
-      USE_TREE_LIST@[39; 180)
-        L_CURLY@[39; 40) "{"
-        WHITESPACE@[40; 42) "\n "
-        USE_TREE@[42; 72)
-          PATH@[42; 53)
-            PATH@[42; 47)
-              PATH_SEGMENT@[42; 47)
-                NAME_REF@[42; 47)
-                  IDENT@[42; 47) "other"
-            COLON2@[47; 49) "::"
-            PATH_SEGMENT@[49; 53)
-              NAME_REF@[49; 53)
-                IDENT@[49; 53) "path"
-          WHITESPACE@[53; 54) " "
-          ALIAS@[54; 72)
-            AS_KW@[54; 56) "as"
-            WHITESPACE@[56; 57) " "
-            NAME@[57; 72)
-              IDENT@[57; 72) "some_other_name"
-        COMMA@[72; 73) ","
-        WHITESPACE@[73; 75) "\n "
-        USE_TREE@[75; 108)
-          PATH@[75; 90)
-            PATH@[75; 84)
-              PATH_SEGMENT@[75; 84)
-                NAME_REF@[75; 84)
-                  IDENT@[75; 84) "different"
-            COLON2@[84; 86) "::"
-            PATH_SEGMENT@[86; 90)
-              NAME_REF@[86; 90)
-                IDENT@[86; 90) "path"
-          WHITESPACE@[90; 91) " "
-          ALIAS@[91; 108)
-            AS_KW@[91; 93) "as"
-            WHITESPACE@[93; 94) " "
-            NAME@[94; 108)
-              IDENT@[94; 108) "different_name"
-        COMMA@[108; 109) ","
-        WHITESPACE@[109; 111) "\n "
-        USE_TREE@[111; 129)
-          PATH@[111; 129)
-            PATH@[111; 123)
-              PATH@[111; 114)
-                PATH_SEGMENT@[111; 114)
-                  NAME_REF@[111; 114)
-                    IDENT@[111; 114) "yet"
-              COLON2@[114; 116) "::"
-              PATH_SEGMENT@[116; 123)
-                NAME_REF@[116; 123)
-                  IDENT@[116; 123) "another"
-            COLON2@[123; 125) "::"
-            PATH_SEGMENT@[125; 129)
-              NAME_REF@[125; 129)
-                IDENT@[125; 129) "path"
-        COMMA@[129; 130) ","
-        WHITESPACE@[130; 132) "\n "
-        USE_TREE@[132; 178)
-          PATH@[132; 175)
-            PATH@[132; 164)
-              PATH@[132; 158)
-                PATH@[132; 148)
-                  PATH@[132; 144)
-                    PATH@[132; 139)
-                      PATH_SEGMENT@[132; 139)
-                        NAME_REF@[132; 139)
-                          IDENT@[132; 139) "running"
-                    COLON2@[139; 141) "::"
-                    PATH_SEGMENT@[141; 144)
-                      NAME_REF@[141; 144)
-                        IDENT@[141; 144) "out"
-                  COLON2@[144; 146) "::"
-                  PATH_SEGMENT@[146; 148)
-                    NAME_REF@[146; 148)
-                      IDENT@[146; 148) "of"
-                COLON2@[148; 150) "::"
-                PATH_SEGMENT@[150; 158)
-                  NAME_REF@[150; 158)
-                    IDENT@[150; 158) "synonyms"
-              COLON2@[158; 160) "::"
-              PATH_SEGMENT@[160; 164)
-                NAME_REF@[160; 164)
-                  IDENT@[160; 164) "for_"
-            COLON2@[164; 166) "::"
-            PATH_SEGMENT@[166; 175)
-              NAME_REF@[166; 175)
-                IDENT@[166; 175) "different"
-          COLON2@[175; 177) "::"
-          STAR@[177; 178) "*"
-        WHITESPACE@[178; 179) "\n"
-        R_CURLY@[179; 180) "}"
-    SEMICOLON@[180; 181) ";"
-  WHITESPACE@[181; 182) "\n"
-  USE_ITEM@[182; 197)
-    USE_KW@[182; 185) "use"
-    WHITESPACE@[185; 186) " "
-    USE_TREE@[186; 196)
-      PATH@[186; 191)
-        PATH_SEGMENT@[186; 191)
-          NAME_REF@[186; 191)
-            IDENT@[186; 191) "Trait"
-      WHITESPACE@[191; 192) " "
-      ALIAS@[192; 196)
-        AS_KW@[192; 194) "as"
-        WHITESPACE@[194; 195) " "
-        UNDERSCORE@[195; 196) "_"
-    SEMICOLON@[196; 197) ";"
-  WHITESPACE@[197; 198) "\n"
+SOURCE_FILE@0..198
+  USE_ITEM@0..28
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..27
+      PATH@4..14
+        PATH@4..8
+          PATH_SEGMENT@4..8
+            NAME_REF@4..8
+              IDENT@4..8 "some"
+        COLON2@8..10 "::"
+        PATH_SEGMENT@10..14
+          NAME_REF@10..14
+            IDENT@10..14 "path"
+      WHITESPACE@14..15 " "
+      ALIAS@15..27
+        AS_KW@15..17 "as"
+        WHITESPACE@17..18 " "
+        NAME@18..27
+          IDENT@18..27 "some_name"
+    SEMICOLON@27..28 ";"
+  WHITESPACE@28..29 "\n"
+  USE_ITEM@29..181
+    USE_KW@29..32 "use"
+    WHITESPACE@32..33 " "
+    USE_TREE@33..180
+      PATH@33..37
+        PATH_SEGMENT@33..37
+          NAME_REF@33..37
+            IDENT@33..37 "some"
+      COLON2@37..39 "::"
+      USE_TREE_LIST@39..180
+        L_CURLY@39..40 "{"
+        WHITESPACE@40..42 "\n "
+        USE_TREE@42..72
+          PATH@42..53
+            PATH@42..47
+              PATH_SEGMENT@42..47
+                NAME_REF@42..47
+                  IDENT@42..47 "other"
+            COLON2@47..49 "::"
+            PATH_SEGMENT@49..53
+              NAME_REF@49..53
+                IDENT@49..53 "path"
+          WHITESPACE@53..54 " "
+          ALIAS@54..72
+            AS_KW@54..56 "as"
+            WHITESPACE@56..57 " "
+            NAME@57..72
+              IDENT@57..72 "some_other_name"
+        COMMA@72..73 ","
+        WHITESPACE@73..75 "\n "
+        USE_TREE@75..108
+          PATH@75..90
+            PATH@75..84
+              PATH_SEGMENT@75..84
+                NAME_REF@75..84
+                  IDENT@75..84 "different"
+            COLON2@84..86 "::"
+            PATH_SEGMENT@86..90
+              NAME_REF@86..90
+                IDENT@86..90 "path"
+          WHITESPACE@90..91 " "
+          ALIAS@91..108
+            AS_KW@91..93 "as"
+            WHITESPACE@93..94 " "
+            NAME@94..108
+              IDENT@94..108 "different_name"
+        COMMA@108..109 ","
+        WHITESPACE@109..111 "\n "
+        USE_TREE@111..129
+          PATH@111..129
+            PATH@111..123
+              PATH@111..114
+                PATH_SEGMENT@111..114
+                  NAME_REF@111..114
+                    IDENT@111..114 "yet"
+              COLON2@114..116 "::"
+              PATH_SEGMENT@116..123
+                NAME_REF@116..123
+                  IDENT@116..123 "another"
+            COLON2@123..125 "::"
+            PATH_SEGMENT@125..129
+              NAME_REF@125..129
+                IDENT@125..129 "path"
+        COMMA@129..130 ","
+        WHITESPACE@130..132 "\n "
+        USE_TREE@132..178
+          PATH@132..175
+            PATH@132..164
+              PATH@132..158
+                PATH@132..148
+                  PATH@132..144
+                    PATH@132..139
+                      PATH_SEGMENT@132..139
+                        NAME_REF@132..139
+                          IDENT@132..139 "running"
+                    COLON2@139..141 "::"
+                    PATH_SEGMENT@141..144
+                      NAME_REF@141..144
+                        IDENT@141..144 "out"
+                  COLON2@144..146 "::"
+                  PATH_SEGMENT@146..148
+                    NAME_REF@146..148
+                      IDENT@146..148 "of"
+                COLON2@148..150 "::"
+                PATH_SEGMENT@150..158
+                  NAME_REF@150..158
+                    IDENT@150..158 "synonyms"
+              COLON2@158..160 "::"
+              PATH_SEGMENT@160..164
+                NAME_REF@160..164
+                  IDENT@160..164 "for_"
+            COLON2@164..166 "::"
+            PATH_SEGMENT@166..175
+              NAME_REF@166..175
+                IDENT@166..175 "different"
+          COLON2@175..177 "::"
+          STAR@177..178 "*"
+        WHITESPACE@178..179 "\n"
+        R_CURLY@179..180 "}"
+    SEMICOLON@180..181 ";"
+  WHITESPACE@181..182 "\n"
+  USE_ITEM@182..197
+    USE_KW@182..185 "use"
+    WHITESPACE@185..186 " "
+    USE_TREE@186..196
+      PATH@186..191
+        PATH_SEGMENT@186..191
+          NAME_REF@186..191
+            IDENT@186..191 "Trait"
+      WHITESPACE@191..192 " "
+      ALIAS@192..196
+        AS_KW@192..194 "as"
+        WHITESPACE@194..195 " "
+        UNDERSCORE@195..196 "_"
+    SEMICOLON@196..197 ";"
+  WHITESPACE@197..198 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
index e75d569f0..a454dfc3a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
@@ -1,30 +1,30 @@
-SOURCE_FILE@[0; 21)
-  FN_DEF@[0; 20)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 4)
-      IDENT@[3; 4) "a"
-    PARAM_LIST@[4; 6)
-      L_PAREN@[4; 5) "("
-      R_PAREN@[5; 6) ")"
-    WHITESPACE@[6; 7) " "
-    BLOCK_EXPR@[7; 20)
-      BLOCK@[7; 20)
-        L_CURLY@[7; 8) "{"
-        WHITESPACE@[8; 9) " "
-        FN_DEF@[9; 18)
-          FN_KW@[9; 11) "fn"
-          WHITESPACE@[11; 12) " "
-          NAME@[12; 13)
-            IDENT@[12; 13) "b"
-          PARAM_LIST@[13; 15)
-            L_PAREN@[13; 14) "("
-            R_PAREN@[14; 15) ")"
-          WHITESPACE@[15; 16) " "
-          BLOCK_EXPR@[16; 18)
-            BLOCK@[16; 18)
-              L_CURLY@[16; 17) "{"
-              R_CURLY@[17; 18) "}"
-        WHITESPACE@[18; 19) " "
-        R_CURLY@[19; 20) "}"
-  WHITESPACE@[20; 21) "\n"
+SOURCE_FILE@0..21
+  FN_DEF@0..20
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..4
+      IDENT@3..4 "a"
+    PARAM_LIST@4..6
+      L_PAREN@4..5 "("
+      R_PAREN@5..6 ")"
+    WHITESPACE@6..7 " "
+    BLOCK_EXPR@7..20
+      BLOCK@7..20
+        L_CURLY@7..8 "{"
+        WHITESPACE@8..9 " "
+        FN_DEF@9..18
+          FN_KW@9..11 "fn"
+          WHITESPACE@11..12 " "
+          NAME@12..13
+            IDENT@12..13 "b"
+          PARAM_LIST@13..15
+            L_PAREN@13..14 "("
+            R_PAREN@14..15 ")"
+          WHITESPACE@15..16 " "
+          BLOCK_EXPR@16..18
+            BLOCK@16..18
+              L_CURLY@16..17 "{"
+              R_CURLY@17..18 "}"
+        WHITESPACE@18..19 " "
+        R_CURLY@19..20 "}"
+  WHITESPACE@20..21 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index 33886154d..2a50f796c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -1,47 +1,47 @@
-SOURCE_FILE@[0; 35)
-  FN_DEF@[0; 34)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    TYPE_PARAM_LIST@[6; 30)
-      L_ANGLE@[6; 7) "<"
-      TYPE_PARAM@[7; 29)
-        NAME@[7; 8)
-          IDENT@[7; 8) "F"
-        COLON@[8; 9) ":"
-        WHITESPACE@[9; 10) " "
-        TYPE_BOUND_LIST@[10; 29)
-          TYPE_BOUND@[10; 29)
-            PATH_TYPE@[10; 29)
-              PATH@[10; 29)
-                PATH_SEGMENT@[10; 29)
-                  NAME_REF@[10; 15)
-                    IDENT@[10; 15) "FnMut"
-                  PARAM_LIST@[15; 29)
-                    L_PAREN@[15; 16) "("
-                    PARAM@[16; 28)
-                      REFERENCE_TYPE@[16; 28)
-                        AMP@[16; 17) "&"
-                        MUT_KW@[17; 20) "mut"
-                        WHITESPACE@[20; 21) " "
-                        PATH_TYPE@[21; 28)
-                          PATH@[21; 28)
-                            PATH_SEGMENT@[21; 28)
-                              NAME_REF@[21; 24)
-                                IDENT@[21; 24) "Foo"
-                              TYPE_ARG_LIST@[24; 28)
-                                L_ANGLE@[24; 25) "<"
-                                LIFETIME_ARG@[25; 27)
-                                  LIFETIME@[25; 27) "\'a"
-                                R_ANGLE@[27; 28) ">"
-                    R_PAREN@[28; 29) ")"
-      R_ANGLE@[29; 30) ">"
-    PARAM_LIST@[30; 32)
-      L_PAREN@[30; 31) "("
-      R_PAREN@[31; 32) ")"
-    BLOCK_EXPR@[32; 34)
-      BLOCK@[32; 34)
-        L_CURLY@[32; 33) "{"
-        R_CURLY@[33; 34) "}"
-  WHITESPACE@[34; 35) "\n"
+SOURCE_FILE@0..35
+  FN_DEF@0..34
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    TYPE_PARAM_LIST@6..30
+      L_ANGLE@6..7 "<"
+      TYPE_PARAM@7..29
+        NAME@7..8
+          IDENT@7..8 "F"
+        COLON@8..9 ":"
+        WHITESPACE@9..10 " "
+        TYPE_BOUND_LIST@10..29
+          TYPE_BOUND@10..29
+            PATH_TYPE@10..29
+              PATH@10..29
+                PATH_SEGMENT@10..29
+                  NAME_REF@10..15
+                    IDENT@10..15 "FnMut"
+                  PARAM_LIST@15..29
+                    L_PAREN@15..16 "("
+                    PARAM@16..28
+                      REFERENCE_TYPE@16..28
+                        AMP@16..17 "&"
+                        MUT_KW@17..20 "mut"
+                        WHITESPACE@20..21 " "
+                        PATH_TYPE@21..28
+                          PATH@21..28
+                            PATH_SEGMENT@21..28
+                              NAME_REF@21..24
+                                IDENT@21..24 "Foo"
+                              TYPE_ARG_LIST@24..28
+                                L_ANGLE@24..25 "<"
+                                LIFETIME_ARG@25..27
+                                  LIFETIME@25..27 "\'a"
+                                R_ANGLE@27..28 ">"
+                    R_PAREN@28..29 ")"
+      R_ANGLE@29..30 ">"
+    PARAM_LIST@30..32
+      L_PAREN@30..31 "("
+      R_PAREN@31..32 ")"
+    BLOCK_EXPR@32..34
+      BLOCK@32..34
+        L_CURLY@32..33 "{"
+        R_CURLY@33..34 "}"
+  WHITESPACE@34..35 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
index 988b58d82..c28dc9d61 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
@@ -1,20 +1,20 @@
-SOURCE_FILE@[0; 17)
-  TYPE_ALIAS_DEF@[0; 16)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    TUPLE_TYPE@[9; 15)
-      L_PAREN@[9; 10) "("
-      PATH_TYPE@[10; 13)
-        PATH@[10; 13)
-          PATH_SEGMENT@[10; 13)
-            NAME_REF@[10; 13)
-              IDENT@[10; 13) "i32"
-      COMMA@[13; 14) ","
-      R_PAREN@[14; 15) ")"
-    SEMICOLON@[15; 16) ";"
-  WHITESPACE@[16; 17) "\n"
+SOURCE_FILE@0..17
+  TYPE_ALIAS_DEF@0..16
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    TUPLE_TYPE@9..15
+      L_PAREN@9..10 "("
+      PATH_TYPE@10..13
+        PATH@10..13
+          PATH_SEGMENT@10..13
+            NAME_REF@10..13
+              IDENT@10..13 "i32"
+      COMMA@13..14 ","
+      R_PAREN@14..15 ")"
+    SEMICOLON@15..16 ";"
+  WHITESPACE@16..17 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
index 0a768a8e3..52de6023b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
@@ -1,18 +1,18 @@
-SOURCE_FILE@[0; 27)
-  IMPL_DEF@[0; 26)
-    UNSAFE_KW@[0; 6) "unsafe"
-    WHITESPACE@[6; 7) " "
-    DEFAULT_KW@[7; 14) "default"
-    WHITESPACE@[14; 15) " "
-    IMPL_KW@[15; 19) "impl"
-    WHITESPACE@[19; 20) " "
-    PATH_TYPE@[20; 23)
-      PATH@[20; 23)
-        PATH_SEGMENT@[20; 23)
-          NAME_REF@[20; 23)
-            IDENT@[20; 23) "Foo"
-    WHITESPACE@[23; 24) " "
-    ITEM_LIST@[24; 26)
-      L_CURLY@[24; 25) "{"
-      R_CURLY@[25; 26) "}"
-  WHITESPACE@[26; 27) "\n"
+SOURCE_FILE@0..27
+  IMPL_DEF@0..26
+    UNSAFE_KW@0..6 "unsafe"
+    WHITESPACE@6..7 " "
+    DEFAULT_KW@7..14 "default"
+    WHITESPACE@14..15 " "
+    IMPL_KW@15..19 "impl"
+    WHITESPACE@19..20 " "
+    PATH_TYPE@20..23
+      PATH@20..23
+        PATH_SEGMENT@20..23
+          NAME_REF@20..23
+            IDENT@20..23 "Foo"
+    WHITESPACE@23..24 " "
+    ITEM_LIST@24..26
+      L_CURLY@24..25 "{"
+      R_CURLY@25..26 "}"
+  WHITESPACE@26..27 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 02f2a9db6..7f87e05ec 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -1,83 +1,83 @@
-SOURCE_FILE@[0; 58)
-  FN_DEF@[0; 26)
-    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) " "
-    RET_TYPE@[9; 23)
-      THIN_ARROW@[9; 11) "->"
-      WHITESPACE@[11; 12) " "
-      PATH_TYPE@[12; 23)
-        PATH@[12; 23)
-          PATH_SEGMENT@[12; 23)
-            NAME_REF@[12; 15)
-              IDENT@[12; 15) "Box"
-            TYPE_ARG_LIST@[15; 23)
-              L_ANGLE@[15; 16) "<"
-              TYPE_ARG@[16; 22)
-                DYN_TRAIT_TYPE@[16; 22)
-                  TYPE_BOUND_LIST@[16; 22)
-                    TYPE_BOUND@[16; 17)
-                      PATH_TYPE@[16; 17)
-                        PATH@[16; 17)
-                          PATH_SEGMENT@[16; 17)
-                            NAME_REF@[16; 17)
-                              IDENT@[16; 17) "T"
-                    WHITESPACE@[17; 18) " "
-                    PLUS@[18; 19) "+"
-                    WHITESPACE@[19; 20) " "
-                    TYPE_BOUND@[20; 22)
-                      LIFETIME@[20; 22) "\'f"
-              R_ANGLE@[22; 23) ">"
-    WHITESPACE@[23; 24) " "
-    BLOCK_EXPR@[24; 26)
-      BLOCK@[24; 26)
-        L_CURLY@[24; 25) "{"
-        R_CURLY@[25; 26) "}"
-  WHITESPACE@[26; 27) "\n"
-  FN_DEF@[27; 57)
-    FN_KW@[27; 29) "fn"
-    WHITESPACE@[29; 30) " "
-    NAME@[30; 33)
-      IDENT@[30; 33) "foo"
-    PARAM_LIST@[33; 35)
-      L_PAREN@[33; 34) "("
-      R_PAREN@[34; 35) ")"
-    WHITESPACE@[35; 36) " "
-    RET_TYPE@[36; 54)
-      THIN_ARROW@[36; 38) "->"
-      WHITESPACE@[38; 39) " "
-      PATH_TYPE@[39; 54)
-        PATH@[39; 54)
-          PATH_SEGMENT@[39; 54)
-            NAME_REF@[39; 42)
-              IDENT@[39; 42) "Box"
-            TYPE_ARG_LIST@[42; 54)
-              L_ANGLE@[42; 43) "<"
-              TYPE_ARG@[43; 53)
-                DYN_TRAIT_TYPE@[43; 53)
-                  DYN_KW@[43; 46) "dyn"
-                  WHITESPACE@[46; 47) " "
-                  TYPE_BOUND_LIST@[47; 53)
-                    TYPE_BOUND@[47; 48)
-                      PATH_TYPE@[47; 48)
-                        PATH@[47; 48)
-                          PATH_SEGMENT@[47; 48)
-                            NAME_REF@[47; 48)
-                              IDENT@[47; 48) "T"
-                    WHITESPACE@[48; 49) " "
-                    PLUS@[49; 50) "+"
-                    WHITESPACE@[50; 51) " "
-                    TYPE_BOUND@[51; 53)
-                      LIFETIME@[51; 53) "\'f"
-              R_ANGLE@[53; 54) ">"
-    WHITESPACE@[54; 55) " "
-    BLOCK_EXPR@[55; 57)
-      BLOCK@[55; 57)
-        L_CURLY@[55; 56) "{"
-        R_CURLY@[56; 57) "}"
-  WHITESPACE@[57; 58) "\n"
+SOURCE_FILE@0..58
+  FN_DEF@0..26
+    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 " "
+    RET_TYPE@9..23
+      THIN_ARROW@9..11 "->"
+      WHITESPACE@11..12 " "
+      PATH_TYPE@12..23
+        PATH@12..23
+          PATH_SEGMENT@12..23
+            NAME_REF@12..15
+              IDENT@12..15 "Box"
+            TYPE_ARG_LIST@15..23
+              L_ANGLE@15..16 "<"
+              TYPE_ARG@16..22
+                DYN_TRAIT_TYPE@16..22
+                  TYPE_BOUND_LIST@16..22
+                    TYPE_BOUND@16..17
+                      PATH_TYPE@16..17
+                        PATH@16..17
+                          PATH_SEGMENT@16..17
+                            NAME_REF@16..17
+                              IDENT@16..17 "T"
+                    WHITESPACE@17..18 " "
+                    PLUS@18..19 "+"
+                    WHITESPACE@19..20 " "
+                    TYPE_BOUND@20..22
+                      LIFETIME@20..22 "\'f"
+              R_ANGLE@22..23 ">"
+    WHITESPACE@23..24 " "
+    BLOCK_EXPR@24..26
+      BLOCK@24..26
+        L_CURLY@24..25 "{"
+        R_CURLY@25..26 "}"
+  WHITESPACE@26..27 "\n"
+  FN_DEF@27..57
+    FN_KW@27..29 "fn"
+    WHITESPACE@29..30 " "
+    NAME@30..33
+      IDENT@30..33 "foo"
+    PARAM_LIST@33..35
+      L_PAREN@33..34 "("
+      R_PAREN@34..35 ")"
+    WHITESPACE@35..36 " "
+    RET_TYPE@36..54
+      THIN_ARROW@36..38 "->"
+      WHITESPACE@38..39 " "
+      PATH_TYPE@39..54
+        PATH@39..54
+          PATH_SEGMENT@39..54
+            NAME_REF@39..42
+              IDENT@39..42 "Box"
+            TYPE_ARG_LIST@42..54
+              L_ANGLE@42..43 "<"
+              TYPE_ARG@43..53
+                DYN_TRAIT_TYPE@43..53
+                  DYN_KW@43..46 "dyn"
+                  WHITESPACE@46..47 " "
+                  TYPE_BOUND_LIST@47..53
+                    TYPE_BOUND@47..48
+                      PATH_TYPE@47..48
+                        PATH@47..48
+                          PATH_SEGMENT@47..48
+                            NAME_REF@47..48
+                              IDENT@47..48 "T"
+                    WHITESPACE@48..49 " "
+                    PLUS@49..50 "+"
+                    WHITESPACE@50..51 " "
+                    TYPE_BOUND@51..53
+                      LIFETIME@51..53 "\'f"
+              R_ANGLE@53..54 ">"
+    WHITESPACE@54..55 " "
+    BLOCK_EXPR@55..57
+      BLOCK@55..57
+        L_CURLY@55..56 "{"
+        R_CURLY@56..57 "}"
+  WHITESPACE@57..58 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index 036035f6c..8bf62cda9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
@@ -1,22 +1,22 @@
-SOURCE_FILE@[0; 22)
-  TRAIT_DEF@[0; 21)
-    TRAIT_KW@[0; 5) "trait"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 7)
-      IDENT@[6; 7) "T"
-    WHITESPACE@[7; 8) " "
-    ITEM_LIST@[8; 21)
-      L_CURLY@[8; 9) "{"
-      WHITESPACE@[9; 10) " "
-      FN_DEF@[10; 19)
-        FN_KW@[10; 12) "fn"
-        WHITESPACE@[12; 13) " "
-        NAME@[13; 16)
-          IDENT@[13; 16) "foo"
-        PARAM_LIST@[16; 18)
-          L_PAREN@[16; 17) "("
-          R_PAREN@[17; 18) ")"
-        SEMICOLON@[18; 19) ";"
-      WHITESPACE@[19; 20) " "
-      R_CURLY@[20; 21) "}"
-  WHITESPACE@[21; 22) "\n"
+SOURCE_FILE@0..22
+  TRAIT_DEF@0..21
+    TRAIT_KW@0..5 "trait"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "T"
+    WHITESPACE@7..8 " "
+    ITEM_LIST@8..21
+      L_CURLY@8..9 "{"
+      WHITESPACE@9..10 " "
+      FN_DEF@10..19
+        FN_KW@10..12 "fn"
+        WHITESPACE@12..13 " "
+        NAME@13..16
+          IDENT@13..16 "foo"
+        PARAM_LIST@16..18
+          L_PAREN@16..17 "("
+          R_PAREN@17..18 ")"
+        SEMICOLON@18..19 ";"
+      WHITESPACE@19..20 " "
+      R_CURLY@20..21 "}"
+  WHITESPACE@21..22 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
index d9fc5eb8a..798ef2a48 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
@@ -1,14 +1,14 @@
-SOURCE_FILE@[0; 13)
-  TYPE_ALIAS_DEF@[0; 12)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    TUPLE_TYPE@[9; 11)
-      L_PAREN@[9; 10) "("
-      R_PAREN@[10; 11) ")"
-    SEMICOLON@[11; 12) ";"
-  WHITESPACE@[12; 13) "\n"
+SOURCE_FILE@0..13
+  TYPE_ALIAS_DEF@0..12
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    TUPLE_TYPE@9..11
+      L_PAREN@9..10 "("
+      R_PAREN@10..11 ")"
+    SEMICOLON@11..12 ";"
+  WHITESPACE@12..13 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
index 8647c23bf..0d2f5ff56 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
@@ -1,70 +1,70 @@
-SOURCE_FILE@[0; 71)
-  TYPE_ALIAS_DEF@[0; 13)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    PATH_TYPE@[9; 12)
-      PATH@[9; 12)
-        PATH_SEGMENT@[9; 12)
-          NAME_REF@[9; 12)
-            IDENT@[9; 12) "Foo"
-    SEMICOLON@[12; 13) ";"
-  WHITESPACE@[13; 14) "\n"
-  TYPE_ALIAS_DEF@[14; 29)
-    TYPE_KW@[14; 18) "type"
-    WHITESPACE@[18; 19) " "
-    NAME@[19; 20)
-      IDENT@[19; 20) "B"
-    WHITESPACE@[20; 21) " "
-    EQ@[21; 22) "="
-    WHITESPACE@[22; 23) " "
-    PATH_TYPE@[23; 28)
-      PATH@[23; 28)
-        PATH_SEGMENT@[23; 28)
-          COLON2@[23; 25) "::"
-          NAME_REF@[25; 28)
-            IDENT@[25; 28) "Foo"
-    SEMICOLON@[28; 29) ";"
-  WHITESPACE@[29; 30) "\n"
-  TYPE_ALIAS_DEF@[30; 49)
-    TYPE_KW@[30; 34) "type"
-    WHITESPACE@[34; 35) " "
-    NAME@[35; 36)
-      IDENT@[35; 36) "C"
-    WHITESPACE@[36; 37) " "
-    EQ@[37; 38) "="
-    WHITESPACE@[38; 39) " "
-    PATH_TYPE@[39; 48)
-      PATH@[39; 48)
-        PATH@[39; 43)
-          PATH_SEGMENT@[39; 43)
-            SELF_KW@[39; 43) "self"
-        COLON2@[43; 45) "::"
-        PATH_SEGMENT@[45; 48)
-          NAME_REF@[45; 48)
-            IDENT@[45; 48) "Foo"
-    SEMICOLON@[48; 49) ";"
-  WHITESPACE@[49; 50) "\n"
-  TYPE_ALIAS_DEF@[50; 70)
-    TYPE_KW@[50; 54) "type"
-    WHITESPACE@[54; 55) " "
-    NAME@[55; 56)
-      IDENT@[55; 56) "D"
-    WHITESPACE@[56; 57) " "
-    EQ@[57; 58) "="
-    WHITESPACE@[58; 59) " "
-    PATH_TYPE@[59; 69)
-      PATH@[59; 69)
-        PATH@[59; 64)
-          PATH_SEGMENT@[59; 64)
-            SUPER_KW@[59; 64) "super"
-        COLON2@[64; 66) "::"
-        PATH_SEGMENT@[66; 69)
-          NAME_REF@[66; 69)
-            IDENT@[66; 69) "Foo"
-    SEMICOLON@[69; 70) ";"
-  WHITESPACE@[70; 71) "\n"
+SOURCE_FILE@0..71
+  TYPE_ALIAS_DEF@0..13
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..12
+      PATH@9..12
+        PATH_SEGMENT@9..12
+          NAME_REF@9..12
+            IDENT@9..12 "Foo"
+    SEMICOLON@12..13 ";"
+  WHITESPACE@13..14 "\n"
+  TYPE_ALIAS_DEF@14..29
+    TYPE_KW@14..18 "type"
+    WHITESPACE@18..19 " "
+    NAME@19..20
+      IDENT@19..20 "B"
+    WHITESPACE@20..21 " "
+    EQ@21..22 "="
+    WHITESPACE@22..23 " "
+    PATH_TYPE@23..28
+      PATH@23..28
+        PATH_SEGMENT@23..28
+          COLON2@23..25 "::"
+          NAME_REF@25..28
+            IDENT@25..28 "Foo"
+    SEMICOLON@28..29 ";"
+  WHITESPACE@29..30 "\n"
+  TYPE_ALIAS_DEF@30..49
+    TYPE_KW@30..34 "type"
+    WHITESPACE@34..35 " "
+    NAME@35..36
+      IDENT@35..36 "C"
+    WHITESPACE@36..37 " "
+    EQ@37..38 "="
+    WHITESPACE@38..39 " "
+    PATH_TYPE@39..48
+      PATH@39..48
+        PATH@39..43
+          PATH_SEGMENT@39..43
+            SELF_KW@39..43 "self"
+        COLON2@43..45 "::"
+        PATH_SEGMENT@45..48
+          NAME_REF@45..48
+            IDENT@45..48 "Foo"
+    SEMICOLON@48..49 ";"
+  WHITESPACE@49..50 "\n"
+  TYPE_ALIAS_DEF@50..70
+    TYPE_KW@50..54 "type"
+    WHITESPACE@54..55 " "
+    NAME@55..56
+      IDENT@55..56 "D"
+    WHITESPACE@56..57 " "
+    EQ@57..58 "="
+    WHITESPACE@58..59 " "
+    PATH_TYPE@59..69
+      PATH@59..69
+        PATH@59..64
+          PATH_SEGMENT@59..64
+            SUPER_KW@59..64 "super"
+        COLON2@64..66 "::"
+        PATH_SEGMENT@66..69
+          NAME_REF@66..69
+            IDENT@66..69 "Foo"
+    SEMICOLON@69..70 ";"
+  WHITESPACE@70..71 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index 690d8504e..5f846177e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -1,96 +1,96 @@
-SOURCE_FILE@[0; 91)
-  FN_DEF@[0; 90)
-    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; 90)
-      BLOCK@[9; 90)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 25)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          PATH_EXPR@[23; 24)
-            PATH@[23; 24)
-              PATH_SEGMENT@[23; 24)
-                NAME_REF@[23; 24)
-                  IDENT@[23; 24) "a"
-          SEMICOLON@[24; 25) ";"
-        WHITESPACE@[25; 30) "\n    "
-        LET_STMT@[30; 43)
-          LET_KW@[30; 33) "let"
-          WHITESPACE@[33; 34) " "
-          PLACEHOLDER_PAT@[34; 35)
-            UNDERSCORE@[34; 35) "_"
-          WHITESPACE@[35; 36) " "
-          EQ@[36; 37) "="
-          WHITESPACE@[37; 38) " "
-          PATH_EXPR@[38; 42)
-            PATH@[38; 42)
-              PATH@[38; 39)
-                PATH_SEGMENT@[38; 39)
-                  NAME_REF@[38; 39)
-                    IDENT@[38; 39) "a"
-              COLON2@[39; 41) "::"
-              PATH_SEGMENT@[41; 42)
-                NAME_REF@[41; 42)
-                  IDENT@[41; 42) "b"
-          SEMICOLON@[42; 43) ";"
-        WHITESPACE@[43; 48) "\n    "
-        LET_STMT@[48; 65)
-          LET_KW@[48; 51) "let"
-          WHITESPACE@[51; 52) " "
-          PLACEHOLDER_PAT@[52; 53)
-            UNDERSCORE@[52; 53) "_"
-          WHITESPACE@[53; 54) " "
-          EQ@[54; 55) "="
-          WHITESPACE@[55; 56) " "
-          PATH_EXPR@[56; 64)
-            PATH@[56; 64)
-              PATH_SEGMENT@[56; 64)
-                COLON2@[56; 58) "::"
-                NAME_REF@[58; 59)
-                  IDENT@[58; 59) "a"
-                TYPE_ARG_LIST@[59; 64)
-                  COLON2@[59; 61) "::"
-                  L_ANGLE@[61; 62) "<"
-                  TYPE_ARG@[62; 63)
-                    PATH_TYPE@[62; 63)
-                      PATH@[62; 63)
-                        PATH_SEGMENT@[62; 63)
-                          NAME_REF@[62; 63)
-                            IDENT@[62; 63) "b"
-                  R_ANGLE@[63; 64) ">"
-          SEMICOLON@[64; 65) ";"
-        WHITESPACE@[65; 70) "\n    "
-        LET_STMT@[70; 88)
-          LET_KW@[70; 73) "let"
-          WHITESPACE@[73; 74) " "
-          PLACEHOLDER_PAT@[74; 75)
-            UNDERSCORE@[74; 75) "_"
-          WHITESPACE@[75; 76) " "
-          EQ@[76; 77) "="
-          WHITESPACE@[77; 78) " "
-          MACRO_CALL@[78; 87)
-            PATH@[78; 84)
-              PATH_SEGMENT@[78; 84)
-                NAME_REF@[78; 84)
-                  IDENT@[78; 84) "format"
-            BANG@[84; 85) "!"
-            TOKEN_TREE@[85; 87)
-              L_PAREN@[85; 86) "("
-              R_PAREN@[86; 87) ")"
-          SEMICOLON@[87; 88) ";"
-        WHITESPACE@[88; 89) "\n"
-        R_CURLY@[89; 90) "}"
-  WHITESPACE@[90; 91) "\n"
+SOURCE_FILE@0..91
+  FN_DEF@0..90
+    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..90
+      BLOCK@9..90
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..25
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          PATH_EXPR@23..24
+            PATH@23..24
+              PATH_SEGMENT@23..24
+                NAME_REF@23..24
+                  IDENT@23..24 "a"
+          SEMICOLON@24..25 ";"
+        WHITESPACE@25..30 "\n    "
+        LET_STMT@30..43
+          LET_KW@30..33 "let"
+          WHITESPACE@33..34 " "
+          PLACEHOLDER_PAT@34..35
+            UNDERSCORE@34..35 "_"
+          WHITESPACE@35..36 " "
+          EQ@36..37 "="
+          WHITESPACE@37..38 " "
+          PATH_EXPR@38..42
+            PATH@38..42
+              PATH@38..39
+                PATH_SEGMENT@38..39
+                  NAME_REF@38..39
+                    IDENT@38..39 "a"
+              COLON2@39..41 "::"
+              PATH_SEGMENT@41..42
+                NAME_REF@41..42
+                  IDENT@41..42 "b"
+          SEMICOLON@42..43 ";"
+        WHITESPACE@43..48 "\n    "
+        LET_STMT@48..65
+          LET_KW@48..51 "let"
+          WHITESPACE@51..52 " "
+          PLACEHOLDER_PAT@52..53
+            UNDERSCORE@52..53 "_"
+          WHITESPACE@53..54 " "
+          EQ@54..55 "="
+          WHITESPACE@55..56 " "
+          PATH_EXPR@56..64
+            PATH@56..64
+              PATH_SEGMENT@56..64
+                COLON2@56..58 "::"
+                NAME_REF@58..59
+                  IDENT@58..59 "a"
+                TYPE_ARG_LIST@59..64
+                  COLON2@59..61 "::"
+                  L_ANGLE@61..62 "<"
+                  TYPE_ARG@62..63
+                    PATH_TYPE@62..63
+                      PATH@62..63
+                        PATH_SEGMENT@62..63
+                          NAME_REF@62..63
+                            IDENT@62..63 "b"
+                  R_ANGLE@63..64 ">"
+          SEMICOLON@64..65 ";"
+        WHITESPACE@65..70 "\n    "
+        LET_STMT@70..88
+          LET_KW@70..73 "let"
+          WHITESPACE@73..74 " "
+          PLACEHOLDER_PAT@74..75
+            UNDERSCORE@74..75 "_"
+          WHITESPACE@75..76 " "
+          EQ@76..77 "="
+          WHITESPACE@77..78 " "
+          MACRO_CALL@78..87
+            PATH@78..84
+              PATH_SEGMENT@78..84
+                NAME_REF@78..84
+                  IDENT@78..84 "format"
+            BANG@84..85 "!"
+            TOKEN_TREE@85..87
+              L_PAREN@85..86 "("
+              R_PAREN@86..87 ")"
+          SEMICOLON@87..88 ";"
+        WHITESPACE@88..89 "\n"
+        R_CURLY@89..90 "}"
+  WHITESPACE@90..91 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
index 731c31f76..6362aa02d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
@@ -1,44 +1,44 @@
-SOURCE_FILE@[0; 64)
-  STRUCT_DEF@[0; 63)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 8)
-      IDENT@[7; 8) "S"
-    WHITESPACE@[8; 9) " "
-    RECORD_FIELD_DEF_LIST@[9; 63)
-      L_CURLY@[9; 10) "{"
-      WHITESPACE@[10; 15) "\n    "
-      RECORD_FIELD_DEF@[15; 60)
-        ATTR@[15; 43)
-          POUND@[15; 16) "#"
-          L_BRACK@[16; 17) "["
-          PATH@[17; 22)
-            PATH_SEGMENT@[17; 22)
-              NAME_REF@[17; 22)
-                IDENT@[17; 22) "serde"
-          TOKEN_TREE@[22; 42)
-            L_PAREN@[22; 23) "("
-            IDENT@[23; 27) "with"
-            WHITESPACE@[27; 28) " "
-            EQ@[28; 29) "="
-            WHITESPACE@[29; 30) " "
-            STRING@[30; 41) "\"url_serde\""
-            R_PAREN@[41; 42) ")"
-          R_BRACK@[42; 43) "]"
-        WHITESPACE@[43; 48) "\n    "
-        VISIBILITY@[48; 51)
-          PUB_KW@[48; 51) "pub"
-        WHITESPACE@[51; 52) " "
-        NAME@[52; 55)
-          IDENT@[52; 55) "uri"
-        COLON@[55; 56) ":"
-        WHITESPACE@[56; 57) " "
-        PATH_TYPE@[57; 60)
-          PATH@[57; 60)
-            PATH_SEGMENT@[57; 60)
-              NAME_REF@[57; 60)
-                IDENT@[57; 60) "Uri"
-      COMMA@[60; 61) ","
-      WHITESPACE@[61; 62) "\n"
-      R_CURLY@[62; 63) "}"
-  WHITESPACE@[63; 64) "\n"
+SOURCE_FILE@0..64
+  STRUCT_DEF@0..63
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..8
+      IDENT@7..8 "S"
+    WHITESPACE@8..9 " "
+    RECORD_FIELD_DEF_LIST@9..63
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      RECORD_FIELD_DEF@15..60
+        ATTR@15..43
+          POUND@15..16 "#"
+          L_BRACK@16..17 "["
+          PATH@17..22
+            PATH_SEGMENT@17..22
+              NAME_REF@17..22
+                IDENT@17..22 "serde"
+          TOKEN_TREE@22..42
+            L_PAREN@22..23 "("
+            IDENT@23..27 "with"
+            WHITESPACE@27..28 " "
+            EQ@28..29 "="
+            WHITESPACE@29..30 " "
+            STRING@30..41 "\"url_serde\""
+            R_PAREN@41..42 ")"
+          R_BRACK@42..43 "]"
+        WHITESPACE@43..48 "\n    "
+        VISIBILITY@48..51
+          PUB_KW@48..51 "pub"
+        WHITESPACE@51..52 " "
+        NAME@52..55
+          IDENT@52..55 "uri"
+        COLON@55..56 ":"
+        WHITESPACE@56..57 " "
+        PATH_TYPE@57..60
+          PATH@57..60
+            PATH_SEGMENT@57..60
+              NAME_REF@57..60
+                IDENT@57..60 "Uri"
+      COMMA@60..61 ","
+      WHITESPACE@61..62 "\n"
+      R_CURLY@62..63 "}"
+  WHITESPACE@63..64 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index 2b28cec67..d9310e82e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
@@ -1,77 +1,77 @@
-SOURCE_FILE@[0; 113)
-  FN_DEF@[0; 112)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 112)
-      BLOCK@[10; 112)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        MATCH_EXPR@[16; 110)
-          MATCH_KW@[16; 21) "match"
-          WHITESPACE@[21; 22) " "
-          TUPLE_EXPR@[22; 24)
-            L_PAREN@[22; 23) "("
-            R_PAREN@[23; 24) ")"
-          WHITESPACE@[24; 25) " "
-          MATCH_ARM_LIST@[25; 110)
-            L_CURLY@[25; 26) "{"
-            WHITESPACE@[26; 35) "\n        "
-            MATCH_ARM@[35; 43)
-              LITERAL_PAT@[35; 37)
-                MINUS@[35; 36) "-"
-                LITERAL@[36; 37)
-                  INT_NUMBER@[36; 37) "1"
-              WHITESPACE@[37; 38) " "
-              FAT_ARROW@[38; 40) "=>"
-              WHITESPACE@[40; 41) " "
-              TUPLE_EXPR@[41; 43)
-                L_PAREN@[41; 42) "("
-                R_PAREN@[42; 43) ")"
-            COMMA@[43; 44) ","
-            WHITESPACE@[44; 53) "\n        "
-            MATCH_ARM@[53; 61)
-              LITERAL_PAT@[53; 55)
-                LITERAL@[53; 55)
-                  INT_NUMBER@[53; 55) "92"
-              WHITESPACE@[55; 56) " "
-              FAT_ARROW@[56; 58) "=>"
-              WHITESPACE@[58; 59) " "
-              TUPLE_EXPR@[59; 61)
-                L_PAREN@[59; 60) "("
-                R_PAREN@[60; 61) ")"
-            COMMA@[61; 62) ","
-            WHITESPACE@[62; 71) "\n        "
-            MATCH_ARM@[71; 80)
-              LITERAL_PAT@[71; 74)
-                LITERAL@[71; 74)
-                  CHAR@[71; 74) "\'c\'"
-              WHITESPACE@[74; 75) " "
-              FAT_ARROW@[75; 77) "=>"
-              WHITESPACE@[77; 78) " "
-              TUPLE_EXPR@[78; 80)
-                L_PAREN@[78; 79) "("
-                R_PAREN@[79; 80) ")"
-            COMMA@[80; 81) ","
-            WHITESPACE@[81; 90) "\n        "
-            MATCH_ARM@[90; 103)
-              LITERAL_PAT@[90; 97)
-                LITERAL@[90; 97)
-                  STRING@[90; 97) "\"hello\""
-              WHITESPACE@[97; 98) " "
-              FAT_ARROW@[98; 100) "=>"
-              WHITESPACE@[100; 101) " "
-              TUPLE_EXPR@[101; 103)
-                L_PAREN@[101; 102) "("
-                R_PAREN@[102; 103) ")"
-            COMMA@[103; 104) ","
-            WHITESPACE@[104; 109) "\n    "
-            R_CURLY@[109; 110) "}"
-        WHITESPACE@[110; 111) "\n"
-        R_CURLY@[111; 112) "}"
-  WHITESPACE@[112; 113) "\n"
+SOURCE_FILE@0..113
+  FN_DEF@0..112
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..112
+      BLOCK@10..112
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        MATCH_EXPR@16..110
+          MATCH_KW@16..21 "match"
+          WHITESPACE@21..22 " "
+          TUPLE_EXPR@22..24
+            L_PAREN@22..23 "("
+            R_PAREN@23..24 ")"
+          WHITESPACE@24..25 " "
+          MATCH_ARM_LIST@25..110
+            L_CURLY@25..26 "{"
+            WHITESPACE@26..35 "\n        "
+            MATCH_ARM@35..43
+              LITERAL_PAT@35..37
+                MINUS@35..36 "-"
+                LITERAL@36..37
+                  INT_NUMBER@36..37 "1"
+              WHITESPACE@37..38 " "
+              FAT_ARROW@38..40 "=>"
+              WHITESPACE@40..41 " "
+              TUPLE_EXPR@41..43
+                L_PAREN@41..42 "("
+                R_PAREN@42..43 ")"
+            COMMA@43..44 ","
+            WHITESPACE@44..53 "\n        "
+            MATCH_ARM@53..61
+              LITERAL_PAT@53..55
+                LITERAL@53..55
+                  INT_NUMBER@53..55 "92"
+              WHITESPACE@55..56 " "
+              FAT_ARROW@56..58 "=>"
+              WHITESPACE@58..59 " "
+              TUPLE_EXPR@59..61
+                L_PAREN@59..60 "("
+                R_PAREN@60..61 ")"
+            COMMA@61..62 ","
+            WHITESPACE@62..71 "\n        "
+            MATCH_ARM@71..80
+              LITERAL_PAT@71..74
+                LITERAL@71..74
+                  CHAR@71..74 "\'c\'"
+              WHITESPACE@74..75 " "
+              FAT_ARROW@75..77 "=>"
+              WHITESPACE@77..78 " "
+              TUPLE_EXPR@78..80
+                L_PAREN@78..79 "("
+                R_PAREN@79..80 ")"
+            COMMA@80..81 ","
+            WHITESPACE@81..90 "\n        "
+            MATCH_ARM@90..103
+              LITERAL_PAT@90..97
+                LITERAL@90..97
+                  STRING@90..97 "\"hello\""
+              WHITESPACE@97..98 " "
+              FAT_ARROW@98..100 "=>"
+              WHITESPACE@100..101 " "
+              TUPLE_EXPR@101..103
+                L_PAREN@101..102 "("
+                R_PAREN@102..103 ")"
+            COMMA@103..104 ","
+            WHITESPACE@104..109 "\n    "
+            R_CURLY@109..110 "}"
+        WHITESPACE@110..111 "\n"
+        R_CURLY@111..112 "}"
+  WHITESPACE@112..113 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
index c6082791a..2e727c1ef 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -1,111 +1,111 @@
-SOURCE_FILE@[0; 116)
-  FN_DEF@[0; 115)
-    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) "\n"
-    WHERE_CLAUSE@[9; 112)
-      WHERE_KW@[9; 14) "where"
-      WHITESPACE@[14; 18) "\n   "
-      WHERE_PRED@[18; 29)
-        LIFETIME@[18; 20) "\'a"
-        COLON@[20; 21) ":"
-        WHITESPACE@[21; 22) " "
-        TYPE_BOUND_LIST@[22; 29)
-          TYPE_BOUND@[22; 24)
-            LIFETIME@[22; 24) "\'b"
-          WHITESPACE@[24; 25) " "
-          PLUS@[25; 26) "+"
-          WHITESPACE@[26; 27) " "
-          TYPE_BOUND@[27; 29)
-            LIFETIME@[27; 29) "\'c"
-      COMMA@[29; 30) ","
-      WHITESPACE@[30; 34) "\n   "
-      WHERE_PRED@[34; 59)
-        PATH_TYPE@[34; 35)
-          PATH@[34; 35)
-            PATH_SEGMENT@[34; 35)
-              NAME_REF@[34; 35)
-                IDENT@[34; 35) "T"
-        COLON@[35; 36) ":"
-        WHITESPACE@[36; 37) " "
-        TYPE_BOUND_LIST@[37; 59)
-          TYPE_BOUND@[37; 42)
-            PATH_TYPE@[37; 42)
-              PATH@[37; 42)
-                PATH_SEGMENT@[37; 42)
-                  NAME_REF@[37; 42)
-                    IDENT@[37; 42) "Clone"
-          WHITESPACE@[42; 43) " "
-          PLUS@[43; 44) "+"
-          WHITESPACE@[44; 45) " "
-          TYPE_BOUND@[45; 49)
-            PATH_TYPE@[45; 49)
-              PATH@[45; 49)
-                PATH_SEGMENT@[45; 49)
-                  NAME_REF@[45; 49)
-                    IDENT@[45; 49) "Copy"
-          WHITESPACE@[49; 50) " "
-          PLUS@[50; 51) "+"
-          WHITESPACE@[51; 52) " "
-          TYPE_BOUND@[52; 59)
-            LIFETIME@[52; 59) "\'static"
-      COMMA@[59; 60) ","
-      WHITESPACE@[60; 64) "\n   "
-      WHERE_PRED@[64; 82)
-        PATH_TYPE@[64; 78)
-          PATH@[64; 78)
-            PATH@[64; 72)
-              PATH_SEGMENT@[64; 72)
-                NAME_REF@[64; 72)
-                  IDENT@[64; 72) "Iterator"
-            COLON2@[72; 74) "::"
-            PATH_SEGMENT@[74; 78)
-              NAME_REF@[74; 78)
-                IDENT@[74; 78) "Item"
-        COLON@[78; 79) ":"
-        WHITESPACE@[79; 80) " "
-        TYPE_BOUND_LIST@[80; 82)
-          TYPE_BOUND@[80; 82)
-            LIFETIME@[80; 82) "\'a"
-      COMMA@[82; 83) ","
-      WHITESPACE@[83; 87) "\n   "
-      WHERE_PRED@[87; 112)
-        PATH_TYPE@[87; 108)
-          PATH@[87; 108)
-            PATH@[87; 102)
-              PATH_SEGMENT@[87; 102)
-                L_ANGLE@[87; 88) "<"
-                PATH_TYPE@[88; 89)
-                  PATH@[88; 89)
-                    PATH_SEGMENT@[88; 89)
-                      NAME_REF@[88; 89)
-                        IDENT@[88; 89) "T"
-                WHITESPACE@[89; 90) " "
-                AS_KW@[90; 92) "as"
-                WHITESPACE@[92; 93) " "
-                PATH_TYPE@[93; 101)
-                  PATH@[93; 101)
-                    PATH_SEGMENT@[93; 101)
-                      NAME_REF@[93; 101)
-                        IDENT@[93; 101) "Iterator"
-                R_ANGLE@[101; 102) ">"
-            COLON2@[102; 104) "::"
-            PATH_SEGMENT@[104; 108)
-              NAME_REF@[104; 108)
-                IDENT@[104; 108) "Item"
-        COLON@[108; 109) ":"
-        WHITESPACE@[109; 110) " "
-        TYPE_BOUND_LIST@[110; 112)
-          TYPE_BOUND@[110; 112)
-            LIFETIME@[110; 112) "\'a"
-    WHITESPACE@[112; 113) "\n"
-    BLOCK_EXPR@[113; 115)
-      BLOCK@[113; 115)
-        L_CURLY@[113; 114) "{"
-        R_CURLY@[114; 115) "}"
-  WHITESPACE@[115; 116) "\n"
+SOURCE_FILE@0..116
+  FN_DEF@0..115
+    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 "\n"
+    WHERE_CLAUSE@9..112
+      WHERE_KW@9..14 "where"
+      WHITESPACE@14..18 "\n   "
+      WHERE_PRED@18..29
+        LIFETIME@18..20 "\'a"
+        COLON@20..21 ":"
+        WHITESPACE@21..22 " "
+        TYPE_BOUND_LIST@22..29
+          TYPE_BOUND@22..24
+            LIFETIME@22..24 "\'b"
+          WHITESPACE@24..25 " "
+          PLUS@25..26 "+"
+          WHITESPACE@26..27 " "
+          TYPE_BOUND@27..29
+            LIFETIME@27..29 "\'c"
+      COMMA@29..30 ","
+      WHITESPACE@30..34 "\n   "
+      WHERE_PRED@34..59
+        PATH_TYPE@34..35
+          PATH@34..35
+            PATH_SEGMENT@34..35
+              NAME_REF@34..35
+                IDENT@34..35 "T"
+        COLON@35..36 ":"
+        WHITESPACE@36..37 " "
+        TYPE_BOUND_LIST@37..59
+          TYPE_BOUND@37..42
+            PATH_TYPE@37..42
+              PATH@37..42
+                PATH_SEGMENT@37..42
+                  NAME_REF@37..42
+                    IDENT@37..42 "Clone"
+          WHITESPACE@42..43 " "
+          PLUS@43..44 "+"
+          WHITESPACE@44..45 " "
+          TYPE_BOUND@45..49
+            PATH_TYPE@45..49
+              PATH@45..49
+                PATH_SEGMENT@45..49
+                  NAME_REF@45..49
+                    IDENT@45..49 "Copy"
+          WHITESPACE@49..50 " "
+          PLUS@50..51 "+"
+          WHITESPACE@51..52 " "
+          TYPE_BOUND@52..59
+            LIFETIME@52..59 "\'static"
+      COMMA@59..60 ","
+      WHITESPACE@60..64 "\n   "
+      WHERE_PRED@64..82
+        PATH_TYPE@64..78
+          PATH@64..78
+            PATH@64..72
+              PATH_SEGMENT@64..72
+                NAME_REF@64..72
+                  IDENT@64..72 "Iterator"
+            COLON2@72..74 "::"
+            PATH_SEGMENT@74..78
+              NAME_REF@74..78
+                IDENT@74..78 "Item"
+        COLON@78..79 ":"
+        WHITESPACE@79..80 " "
+        TYPE_BOUND_LIST@80..82
+          TYPE_BOUND@80..82
+            LIFETIME@80..82 "\'a"
+      COMMA@82..83 ","
+      WHITESPACE@83..87 "\n   "
+      WHERE_PRED@87..112
+        PATH_TYPE@87..108
+          PATH@87..108
+            PATH@87..102
+              PATH_SEGMENT@87..102
+                L_ANGLE@87..88 "<"
+                PATH_TYPE@88..89
+                  PATH@88..89
+                    PATH_SEGMENT@88..89
+                      NAME_REF@88..89
+                        IDENT@88..89 "T"
+                WHITESPACE@89..90 " "
+                AS_KW@90..92 "as"
+                WHITESPACE@92..93 " "
+                PATH_TYPE@93..101
+                  PATH@93..101
+                    PATH_SEGMENT@93..101
+                      NAME_REF@93..101
+                        IDENT@93..101 "Iterator"
+                R_ANGLE@101..102 ">"
+            COLON2@102..104 "::"
+            PATH_SEGMENT@104..108
+              NAME_REF@104..108
+                IDENT@104..108 "Item"
+        COLON@108..109 ":"
+        WHITESPACE@109..110 " "
+        TYPE_BOUND_LIST@110..112
+          TYPE_BOUND@110..112
+            LIFETIME@110..112 "\'a"
+    WHITESPACE@112..113 "\n"
+    BLOCK_EXPR@113..115
+      BLOCK@113..115
+        L_CURLY@113..114 "{"
+        R_CURLY@114..115 "}"
+  WHITESPACE@115..116 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
index 9788197be..c1e58f9bf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
@@ -1,17 +1,17 @@
-SOURCE_FILE@[0; 18)
-  FN_DEF@[0; 17)
-    CONST_KW@[0; 5) "const"
-    WHITESPACE@[5; 6) " "
-    FN_KW@[6; 8) "fn"
-    WHITESPACE@[8; 9) " "
-    NAME@[9; 12)
-      IDENT@[9; 12) "foo"
-    PARAM_LIST@[12; 14)
-      L_PAREN@[12; 13) "("
-      R_PAREN@[13; 14) ")"
-    WHITESPACE@[14; 15) " "
-    BLOCK_EXPR@[15; 17)
-      BLOCK@[15; 17)
-        L_CURLY@[15; 16) "{"
-        R_CURLY@[16; 17) "}"
-  WHITESPACE@[17; 18) "\n"
+SOURCE_FILE@0..18
+  FN_DEF@0..17
+    CONST_KW@0..5 "const"
+    WHITESPACE@5..6 " "
+    FN_KW@6..8 "fn"
+    WHITESPACE@8..9 " "
+    NAME@9..12
+      IDENT@9..12 "foo"
+    PARAM_LIST@12..14
+      L_PAREN@12..13 "("
+      R_PAREN@13..14 ")"
+    WHITESPACE@14..15 " "
+    BLOCK_EXPR@15..17
+      BLOCK@15..17
+        L_CURLY@15..16 "{"
+        R_CURLY@16..17 "}"
+  WHITESPACE@17..18 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 8d7083e97..9bdf2379f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
@@ -1,83 +1,83 @@
-SOURCE_FILE@[0; 112)
-  FN_DEF@[0; 111)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 111)
-      BLOCK@[10; 111)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        MATCH_EXPR@[16; 109)
-          MATCH_KW@[16; 21) "match"
-          WHITESPACE@[21; 22) " "
-          LITERAL@[22; 24)
-            INT_NUMBER@[22; 24) "92"
-          WHITESPACE@[24; 25) " "
-          MATCH_ARM_LIST@[25; 109)
-            L_CURLY@[25; 26) "{"
-            WHITESPACE@[26; 35) "\n        "
-            MATCH_ARM@[35; 50)
-              RANGE_PAT@[35; 44)
-                LITERAL_PAT@[35; 36)
-                  LITERAL@[35; 36)
-                    INT_NUMBER@[35; 36) "0"
-                WHITESPACE@[36; 37) " "
-                DOT3@[37; 40) "..."
-                WHITESPACE@[40; 41) " "
-                LITERAL_PAT@[41; 44)
-                  LITERAL@[41; 44)
-                    INT_NUMBER@[41; 44) "100"
-              WHITESPACE@[44; 45) " "
-              FAT_ARROW@[45; 47) "=>"
-              WHITESPACE@[47; 48) " "
-              TUPLE_EXPR@[48; 50)
-                L_PAREN@[48; 49) "("
-                R_PAREN@[49; 50) ")"
-            COMMA@[50; 51) ","
-            WHITESPACE@[51; 60) "\n        "
-            MATCH_ARM@[60; 77)
-              RANGE_PAT@[60; 71)
-                LITERAL_PAT@[60; 63)
-                  LITERAL@[60; 63)
-                    INT_NUMBER@[60; 63) "101"
-                WHITESPACE@[63; 64) " "
-                DOT2EQ@[64; 67) "..="
-                WHITESPACE@[67; 68) " "
-                LITERAL_PAT@[68; 71)
-                  LITERAL@[68; 71)
-                    INT_NUMBER@[68; 71) "200"
-              WHITESPACE@[71; 72) " "
-              FAT_ARROW@[72; 74) "=>"
-              WHITESPACE@[74; 75) " "
-              TUPLE_EXPR@[75; 77)
-                L_PAREN@[75; 76) "("
-                R_PAREN@[76; 77) ")"
-            COMMA@[77; 78) ","
-            WHITESPACE@[78; 87) "\n        "
-            MATCH_ARM@[87; 102)
-              RANGE_PAT@[87; 97)
-                LITERAL_PAT@[87; 90)
-                  LITERAL@[87; 90)
-                    INT_NUMBER@[87; 90) "200"
-                WHITESPACE@[90; 91) " "
-                DOT2@[91; 93) ".."
-                WHITESPACE@[93; 94) " "
-                LITERAL_PAT@[94; 97)
-                  LITERAL@[94; 97)
-                    INT_NUMBER@[94; 97) "301"
-              FAT_ARROW@[97; 99) "=>"
-              WHITESPACE@[99; 100) " "
-              TUPLE_EXPR@[100; 102)
-                L_PAREN@[100; 101) "("
-                R_PAREN@[101; 102) ")"
-            COMMA@[102; 103) ","
-            WHITESPACE@[103; 108) "\n    "
-            R_CURLY@[108; 109) "}"
-        WHITESPACE@[109; 110) "\n"
-        R_CURLY@[110; 111) "}"
-  WHITESPACE@[111; 112) "\n"
+SOURCE_FILE@0..112
+  FN_DEF@0..111
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..111
+      BLOCK@10..111
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        MATCH_EXPR@16..109
+          MATCH_KW@16..21 "match"
+          WHITESPACE@21..22 " "
+          LITERAL@22..24
+            INT_NUMBER@22..24 "92"
+          WHITESPACE@24..25 " "
+          MATCH_ARM_LIST@25..109
+            L_CURLY@25..26 "{"
+            WHITESPACE@26..35 "\n        "
+            MATCH_ARM@35..50
+              RANGE_PAT@35..44
+                LITERAL_PAT@35..36
+                  LITERAL@35..36
+                    INT_NUMBER@35..36 "0"
+                WHITESPACE@36..37 " "
+                DOT3@37..40 "..."
+                WHITESPACE@40..41 " "
+                LITERAL_PAT@41..44
+                  LITERAL@41..44
+                    INT_NUMBER@41..44 "100"
+              WHITESPACE@44..45 " "
+              FAT_ARROW@45..47 "=>"
+              WHITESPACE@47..48 " "
+              TUPLE_EXPR@48..50
+                L_PAREN@48..49 "("
+                R_PAREN@49..50 ")"
+            COMMA@50..51 ","
+            WHITESPACE@51..60 "\n        "
+            MATCH_ARM@60..77
+              RANGE_PAT@60..71
+                LITERAL_PAT@60..63
+                  LITERAL@60..63
+                    INT_NUMBER@60..63 "101"
+                WHITESPACE@63..64 " "
+                DOT2EQ@64..67 "..="
+                WHITESPACE@67..68 " "
+                LITERAL_PAT@68..71
+                  LITERAL@68..71
+                    INT_NUMBER@68..71 "200"
+              WHITESPACE@71..72 " "
+              FAT_ARROW@72..74 "=>"
+              WHITESPACE@74..75 " "
+              TUPLE_EXPR@75..77
+                L_PAREN@75..76 "("
+                R_PAREN@76..77 ")"
+            COMMA@77..78 ","
+            WHITESPACE@78..87 "\n        "
+            MATCH_ARM@87..102
+              RANGE_PAT@87..97
+                LITERAL_PAT@87..90
+                  LITERAL@87..90
+                    INT_NUMBER@87..90 "200"
+                WHITESPACE@90..91 " "
+                DOT2@91..93 ".."
+                WHITESPACE@93..94 " "
+                LITERAL_PAT@94..97
+                  LITERAL@94..97
+                    INT_NUMBER@94..97 "301"
+              FAT_ARROW@97..99 "=>"
+              WHITESPACE@99..100 " "
+              TUPLE_EXPR@100..102
+                L_PAREN@100..101 "("
+                R_PAREN@101..102 ")"
+            COMMA@102..103 ","
+            WHITESPACE@103..108 "\n    "
+            R_CURLY@108..109 "}"
+        WHITESPACE@109..110 "\n"
+        R_CURLY@110..111 "}"
+  WHITESPACE@111..112 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index efcd89c4c..e9ca92364 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
@@ -1,60 +1,60 @@
-SOURCE_FILE@[0; 83)
-  FN_DEF@[0; 82)
-    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; 82)
-      BLOCK@[9; 82)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        MATCH_EXPR@[15; 80)
-          MATCH_KW@[15; 20) "match"
-          WHITESPACE@[20; 21) " "
-          TUPLE_EXPR@[21; 23)
-            L_PAREN@[21; 22) "("
-            R_PAREN@[22; 23) ")"
-          WHITESPACE@[23; 24) " "
-          MATCH_ARM_LIST@[24; 80)
-            L_CURLY@[24; 25) "{"
-            WHITESPACE@[25; 34) "\n        "
-            MATCH_ARM@[34; 41)
-              PLACEHOLDER_PAT@[34; 35)
-                UNDERSCORE@[34; 35) "_"
-              WHITESPACE@[35; 36) " "
-              FAT_ARROW@[36; 38) "=>"
-              WHITESPACE@[38; 39) " "
-              TUPLE_EXPR@[39; 41)
-                L_PAREN@[39; 40) "("
-                R_PAREN@[40; 41) ")"
-            COMMA@[41; 42) ","
-            WHITESPACE@[42; 51) "\n        "
-            MATCH_ARM@[51; 58)
-              PLACEHOLDER_PAT@[51; 52)
-                UNDERSCORE@[51; 52) "_"
-              WHITESPACE@[52; 53) " "
-              FAT_ARROW@[53; 55) "=>"
-              WHITESPACE@[55; 56) " "
-              BLOCK_EXPR@[56; 58)
-                BLOCK@[56; 58)
-                  L_CURLY@[56; 57) "{"
-                  R_CURLY@[57; 58) "}"
-            WHITESPACE@[58; 67) "\n        "
-            MATCH_ARM@[67; 74)
-              PLACEHOLDER_PAT@[67; 68)
-                UNDERSCORE@[67; 68) "_"
-              WHITESPACE@[68; 69) " "
-              FAT_ARROW@[69; 71) "=>"
-              WHITESPACE@[71; 72) " "
-              TUPLE_EXPR@[72; 74)
-                L_PAREN@[72; 73) "("
-                R_PAREN@[73; 74) ")"
-            WHITESPACE@[74; 79) "\n    "
-            R_CURLY@[79; 80) "}"
-        WHITESPACE@[80; 81) "\n"
-        R_CURLY@[81; 82) "}"
-  WHITESPACE@[82; 83) "\n"
+SOURCE_FILE@0..83
+  FN_DEF@0..82
+    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..82
+      BLOCK@9..82
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        MATCH_EXPR@15..80
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..80
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            MATCH_ARM@34..41
+              PLACEHOLDER_PAT@34..35
+                UNDERSCORE@34..35 "_"
+              WHITESPACE@35..36 " "
+              FAT_ARROW@36..38 "=>"
+              WHITESPACE@38..39 " "
+              TUPLE_EXPR@39..41
+                L_PAREN@39..40 "("
+                R_PAREN@40..41 ")"
+            COMMA@41..42 ","
+            WHITESPACE@42..51 "\n        "
+            MATCH_ARM@51..58
+              PLACEHOLDER_PAT@51..52
+                UNDERSCORE@51..52 "_"
+              WHITESPACE@52..53 " "
+              FAT_ARROW@53..55 "=>"
+              WHITESPACE@55..56 " "
+              BLOCK_EXPR@56..58
+                BLOCK@56..58
+                  L_CURLY@56..57 "{"
+                  R_CURLY@57..58 "}"
+            WHITESPACE@58..67 "\n        "
+            MATCH_ARM@67..74
+              PLACEHOLDER_PAT@67..68
+                UNDERSCORE@67..68 "_"
+              WHITESPACE@68..69 " "
+              FAT_ARROW@69..71 "=>"
+              WHITESPACE@71..72 " "
+              TUPLE_EXPR@72..74
+                L_PAREN@72..73 "("
+                R_PAREN@73..74 ")"
+            WHITESPACE@74..79 "\n    "
+            R_CURLY@79..80 "}"
+        WHITESPACE@80..81 "\n"
+        R_CURLY@81..82 "}"
+  WHITESPACE@82..83 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
index c6e4ee532..d06fc0be5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
@@ -1,10 +1,10 @@
-SOURCE_FILE@[0; 18)
-  EXTERN_CRATE_ITEM@[0; 17)
-    EXTERN_KW@[0; 6) "extern"
-    WHITESPACE@[6; 7) " "
-    CRATE_KW@[7; 12) "crate"
-    WHITESPACE@[12; 13) " "
-    NAME_REF@[13; 16)
-      IDENT@[13; 16) "foo"
-    SEMICOLON@[16; 17) ";"
-  WHITESPACE@[17; 18) "\n"
+SOURCE_FILE@0..18
+  EXTERN_CRATE_ITEM@0..17
+    EXTERN_KW@0..6 "extern"
+    WHITESPACE@6..7 " "
+    CRATE_KW@7..12 "crate"
+    WHITESPACE@12..13 " "
+    NAME_REF@13..16
+      IDENT@13..16 "foo"
+    SEMICOLON@16..17 ";"
+  WHITESPACE@17..18 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
index 89a611799..15d332938 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
@@ -1,125 +1,125 @@
-SOURCE_FILE@[0; 112)
-  FN_DEF@[0; 111)
-    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; 111)
-      BLOCK@[9; 111)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 20)
-          RECORD_LIT@[15; 19)
-            PATH@[15; 16)
-              PATH_SEGMENT@[15; 16)
-                NAME_REF@[15; 16)
-                  IDENT@[15; 16) "S"
-            WHITESPACE@[16; 17) " "
-            RECORD_FIELD_LIST@[17; 19)
-              L_CURLY@[17; 18) "{"
-              R_CURLY@[18; 19) "}"
-          SEMICOLON@[19; 20) ";"
-        WHITESPACE@[20; 25) "\n    "
-        EXPR_STMT@[25; 41)
-          RECORD_LIT@[25; 40)
-            PATH@[25; 26)
-              PATH_SEGMENT@[25; 26)
-                NAME_REF@[25; 26)
-                  IDENT@[25; 26) "S"
-            WHITESPACE@[26; 27) " "
-            RECORD_FIELD_LIST@[27; 40)
-              L_CURLY@[27; 28) "{"
-              WHITESPACE@[28; 29) " "
-              RECORD_FIELD@[29; 30)
-                PATH_EXPR@[29; 30)
-                  PATH@[29; 30)
-                    PATH_SEGMENT@[29; 30)
-                      NAME_REF@[29; 30)
-                        IDENT@[29; 30) "x"
-              COMMA@[30; 31) ","
-              WHITESPACE@[31; 32) " "
-              RECORD_FIELD@[32; 37)
-                NAME_REF@[32; 33)
-                  IDENT@[32; 33) "y"
-                COLON@[33; 34) ":"
-                WHITESPACE@[34; 35) " "
-                LITERAL@[35; 37)
-                  INT_NUMBER@[35; 37) "32"
-              COMMA@[37; 38) ","
-              WHITESPACE@[38; 39) " "
-              R_CURLY@[39; 40) "}"
-          SEMICOLON@[40; 41) ";"
-        WHITESPACE@[41; 46) "\n    "
-        EXPR_STMT@[46; 83)
-          RECORD_LIT@[46; 82)
-            PATH@[46; 47)
-              PATH_SEGMENT@[46; 47)
-                NAME_REF@[46; 47)
-                  IDENT@[46; 47) "S"
-            WHITESPACE@[47; 48) " "
-            RECORD_FIELD_LIST@[48; 82)
-              L_CURLY@[48; 49) "{"
-              WHITESPACE@[49; 50) " "
-              RECORD_FIELD@[50; 51)
-                PATH_EXPR@[50; 51)
-                  PATH@[50; 51)
-                    PATH_SEGMENT@[50; 51)
-                      NAME_REF@[50; 51)
-                        IDENT@[50; 51) "x"
-              COMMA@[51; 52) ","
-              WHITESPACE@[52; 53) " "
-              RECORD_FIELD@[53; 58)
-                NAME_REF@[53; 54)
-                  IDENT@[53; 54) "y"
-                COLON@[54; 55) ":"
-                WHITESPACE@[55; 56) " "
-                LITERAL@[56; 58)
-                  INT_NUMBER@[56; 58) "32"
-              COMMA@[58; 59) ","
-              WHITESPACE@[59; 60) " "
-              DOT2@[60; 62) ".."
-              CALL_EXPR@[62; 80)
-                PATH_EXPR@[62; 78)
-                  PATH@[62; 78)
-                    PATH@[62; 69)
-                      PATH_SEGMENT@[62; 69)
-                        NAME_REF@[62; 69)
-                          IDENT@[62; 69) "Default"
-                    COLON2@[69; 71) "::"
-                    PATH_SEGMENT@[71; 78)
-                      NAME_REF@[71; 78)
-                        IDENT@[71; 78) "default"
-                ARG_LIST@[78; 80)
-                  L_PAREN@[78; 79) "("
-                  R_PAREN@[79; 80) ")"
-              WHITESPACE@[80; 81) " "
-              R_CURLY@[81; 82) "}"
-          SEMICOLON@[82; 83) ";"
-        WHITESPACE@[83; 88) "\n    "
-        EXPR_STMT@[88; 109)
-          RECORD_LIT@[88; 108)
-            PATH@[88; 99)
-              PATH_SEGMENT@[88; 99)
-                NAME_REF@[88; 99)
-                  IDENT@[88; 99) "TupleStruct"
-            WHITESPACE@[99; 100) " "
-            RECORD_FIELD_LIST@[100; 108)
-              L_CURLY@[100; 101) "{"
-              WHITESPACE@[101; 102) " "
-              RECORD_FIELD@[102; 106)
-                NAME_REF@[102; 103)
-                  INT_NUMBER@[102; 103) "0"
-                COLON@[103; 104) ":"
-                WHITESPACE@[104; 105) " "
-                LITERAL@[105; 106)
-                  INT_NUMBER@[105; 106) "1"
-              WHITESPACE@[106; 107) " "
-              R_CURLY@[107; 108) "}"
-          SEMICOLON@[108; 109) ";"
-        WHITESPACE@[109; 110) "\n"
-        R_CURLY@[110; 111) "}"
-  WHITESPACE@[111; 112) "\n"
+SOURCE_FILE@0..112
+  FN_DEF@0..111
+    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..111
+      BLOCK@9..111
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..20
+          RECORD_LIT@15..19
+            PATH@15..16
+              PATH_SEGMENT@15..16
+                NAME_REF@15..16
+                  IDENT@15..16 "S"
+            WHITESPACE@16..17 " "
+            RECORD_FIELD_LIST@17..19
+              L_CURLY@17..18 "{"
+              R_CURLY@18..19 "}"
+          SEMICOLON@19..20 ";"
+        WHITESPACE@20..25 "\n    "
+        EXPR_STMT@25..41
+          RECORD_LIT@25..40
+            PATH@25..26
+              PATH_SEGMENT@25..26
+                NAME_REF@25..26
+                  IDENT@25..26 "S"
+            WHITESPACE@26..27 " "
+            RECORD_FIELD_LIST@27..40
+              L_CURLY@27..28 "{"
+              WHITESPACE@28..29 " "
+              RECORD_FIELD@29..30
+                PATH_EXPR@29..30
+                  PATH@29..30
+                    PATH_SEGMENT@29..30
+                      NAME_REF@29..30
+                        IDENT@29..30 "x"
+              COMMA@30..31 ","
+              WHITESPACE@31..32 " "
+              RECORD_FIELD@32..37
+                NAME_REF@32..33
+                  IDENT@32..33 "y"
+                COLON@33..34 ":"
+                WHITESPACE@34..35 " "
+                LITERAL@35..37
+                  INT_NUMBER@35..37 "32"
+              COMMA@37..38 ","
+              WHITESPACE@38..39 " "
+              R_CURLY@39..40 "}"
+          SEMICOLON@40..41 ";"
+        WHITESPACE@41..46 "\n    "
+        EXPR_STMT@46..83
+          RECORD_LIT@46..82
+            PATH@46..47
+              PATH_SEGMENT@46..47
+                NAME_REF@46..47
+                  IDENT@46..47 "S"
+            WHITESPACE@47..48 " "
+            RECORD_FIELD_LIST@48..82
+              L_CURLY@48..49 "{"
+              WHITESPACE@49..50 " "
+              RECORD_FIELD@50..51
+                PATH_EXPR@50..51
+                  PATH@50..51
+                    PATH_SEGMENT@50..51
+                      NAME_REF@50..51
+                        IDENT@50..51 "x"
+              COMMA@51..52 ","
+              WHITESPACE@52..53 " "
+              RECORD_FIELD@53..58
+                NAME_REF@53..54
+                  IDENT@53..54 "y"
+                COLON@54..55 ":"
+                WHITESPACE@55..56 " "
+                LITERAL@56..58
+                  INT_NUMBER@56..58 "32"
+              COMMA@58..59 ","
+              WHITESPACE@59..60 " "
+              DOT2@60..62 ".."
+              CALL_EXPR@62..80
+                PATH_EXPR@62..78
+                  PATH@62..78
+                    PATH@62..69
+                      PATH_SEGMENT@62..69
+                        NAME_REF@62..69
+                          IDENT@62..69 "Default"
+                    COLON2@69..71 "::"
+                    PATH_SEGMENT@71..78
+                      NAME_REF@71..78
+                        IDENT@71..78 "default"
+                ARG_LIST@78..80
+                  L_PAREN@78..79 "("
+                  R_PAREN@79..80 ")"
+              WHITESPACE@80..81 " "
+              R_CURLY@81..82 "}"
+          SEMICOLON@82..83 ";"
+        WHITESPACE@83..88 "\n    "
+        EXPR_STMT@88..109
+          RECORD_LIT@88..108
+            PATH@88..99
+              PATH_SEGMENT@88..99
+                NAME_REF@88..99
+                  IDENT@88..99 "TupleStruct"
+            WHITESPACE@99..100 " "
+            RECORD_FIELD_LIST@100..108
+              L_CURLY@100..101 "{"
+              WHITESPACE@101..102 " "
+              RECORD_FIELD@102..106
+                NAME_REF@102..103
+                  INT_NUMBER@102..103 "0"
+                COLON@103..104 ":"
+                WHITESPACE@104..105 " "
+                LITERAL@105..106
+                  INT_NUMBER@105..106 "1"
+              WHITESPACE@106..107 " "
+              R_CURLY@107..108 "}"
+          SEMICOLON@108..109 ";"
+        WHITESPACE@109..110 "\n"
+        R_CURLY@110..111 "}"
+  WHITESPACE@111..112 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index 99e0a0bec..3cce106e4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -1,67 +1,67 @@
-SOURCE_FILE@[0; 70)
-  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) "}"
-  WHITESPACE@[11; 12) "\n"
-  MACRO_CALL@[12; 31)
-    PATH@[12; 23)
-      PATH_SEGMENT@[12; 23)
-        NAME_REF@[12; 23)
-          IDENT@[12; 23) "macro_rules"
-    BANG@[23; 24) "!"
-    WHITESPACE@[24; 25) " "
-    NAME@[25; 28)
-      IDENT@[25; 28) "foo"
-    WHITESPACE@[28; 29) " "
-    TOKEN_TREE@[29; 31)
-      L_CURLY@[29; 30) "{"
-      R_CURLY@[30; 31) "}"
-  WHITESPACE@[31; 32) "\n"
-  MACRO_CALL@[32; 44)
-    PATH@[32; 40)
-      PATH@[32; 35)
-        PATH_SEGMENT@[32; 35)
-          NAME_REF@[32; 35)
-            IDENT@[32; 35) "foo"
-      COLON2@[35; 37) "::"
-      PATH_SEGMENT@[37; 40)
-        NAME_REF@[37; 40)
-          IDENT@[37; 40) "bar"
-    BANG@[40; 41) "!"
-    TOKEN_TREE@[41; 43)
-      L_PAREN@[41; 42) "("
-      R_PAREN@[42; 43) ")"
-    SEMICOLON@[43; 44) ";"
-  WHITESPACE@[44; 45) "\n"
-  MACRO_CALL@[45; 59)
-    PATH@[45; 55)
-      PATH@[45; 50)
-        PATH_SEGMENT@[45; 50)
-          SUPER_KW@[45; 50) "super"
-      COLON2@[50; 52) "::"
-      PATH_SEGMENT@[52; 55)
-        NAME_REF@[52; 55)
-          IDENT@[52; 55) "baz"
-    BANG@[55; 56) "!"
-    WHITESPACE@[56; 57) " "
-    TOKEN_TREE@[57; 59)
-      L_CURLY@[57; 58) "{"
-      R_CURLY@[58; 59) "}"
-  WHITESPACE@[59; 60) "\n"
-  STRUCT_DEF@[60; 69)
-    STRUCT_KW@[60; 66) "struct"
-    WHITESPACE@[66; 67) " "
-    NAME@[67; 68)
-      IDENT@[67; 68) "S"
-    SEMICOLON@[68; 69) ";"
-  WHITESPACE@[69; 70) "\n"
+SOURCE_FILE@0..70
+  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 "}"
+  WHITESPACE@11..12 "\n"
+  MACRO_CALL@12..31
+    PATH@12..23
+      PATH_SEGMENT@12..23
+        NAME_REF@12..23
+          IDENT@12..23 "macro_rules"
+    BANG@23..24 "!"
+    WHITESPACE@24..25 " "
+    NAME@25..28
+      IDENT@25..28 "foo"
+    WHITESPACE@28..29 " "
+    TOKEN_TREE@29..31
+      L_CURLY@29..30 "{"
+      R_CURLY@30..31 "}"
+  WHITESPACE@31..32 "\n"
+  MACRO_CALL@32..44
+    PATH@32..40
+      PATH@32..35
+        PATH_SEGMENT@32..35
+          NAME_REF@32..35
+            IDENT@32..35 "foo"
+      COLON2@35..37 "::"
+      PATH_SEGMENT@37..40
+        NAME_REF@37..40
+          IDENT@37..40 "bar"
+    BANG@40..41 "!"
+    TOKEN_TREE@41..43
+      L_PAREN@41..42 "("
+      R_PAREN@42..43 ")"
+    SEMICOLON@43..44 ";"
+  WHITESPACE@44..45 "\n"
+  MACRO_CALL@45..59
+    PATH@45..55
+      PATH@45..50
+        PATH_SEGMENT@45..50
+          SUPER_KW@45..50 "super"
+      COLON2@50..52 "::"
+      PATH_SEGMENT@52..55
+        NAME_REF@52..55
+          IDENT@52..55 "baz"
+    BANG@55..56 "!"
+    WHITESPACE@56..57 " "
+    TOKEN_TREE@57..59
+      L_CURLY@57..58 "{"
+      R_CURLY@58..59 "}"
+  WHITESPACE@59..60 "\n"
+  STRUCT_DEF@60..69
+    STRUCT_KW@60..66 "struct"
+    WHITESPACE@66..67 " "
+    NAME@67..68
+      IDENT@67..68 "S"
+    SEMICOLON@68..69 ";"
+  WHITESPACE@69..70 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
index 278549a46..24b9a1f46 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
@@ -1,23 +1,23 @@
-SOURCE_FILE@[0; 20)
-  IMPL_DEF@[0; 19)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    BANG@[5; 6) "!"
-    PATH_TYPE@[6; 10)
-      PATH@[6; 10)
-        PATH_SEGMENT@[6; 10)
-          NAME_REF@[6; 10)
-            IDENT@[6; 10) "Send"
-    WHITESPACE@[10; 11) " "
-    FOR_KW@[11; 14) "for"
-    WHITESPACE@[14; 15) " "
-    PATH_TYPE@[15; 16)
-      PATH@[15; 16)
-        PATH_SEGMENT@[15; 16)
-          NAME_REF@[15; 16)
-            IDENT@[15; 16) "X"
-    WHITESPACE@[16; 17) " "
-    ITEM_LIST@[17; 19)
-      L_CURLY@[17; 18) "{"
-      R_CURLY@[18; 19) "}"
-  WHITESPACE@[19; 20) "\n"
+SOURCE_FILE@0..20
+  IMPL_DEF@0..19
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    BANG@5..6 "!"
+    PATH_TYPE@6..10
+      PATH@6..10
+        PATH_SEGMENT@6..10
+          NAME_REF@6..10
+            IDENT@6..10 "Send"
+    WHITESPACE@10..11 " "
+    FOR_KW@11..14 "for"
+    WHITESPACE@14..15 " "
+    PATH_TYPE@15..16
+      PATH@15..16
+        PATH_SEGMENT@15..16
+          NAME_REF@15..16
+            IDENT@15..16 "X"
+    WHITESPACE@16..17 " "
+    ITEM_LIST@17..19
+      L_CURLY@17..18 "{"
+      R_CURLY@18..19 "}"
+  WHITESPACE@19..20 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index df24ae189..5e1b4cc68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -1,132 +1,132 @@
-SOURCE_FILE@[0; 137)
-  FN_DEF@[0; 136)
-    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; 136)
-      BLOCK@[9; 136)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 26)
-          IF_EXPR@[15; 25)
-            IF_KW@[15; 17) "if"
-            WHITESPACE@[17; 18) " "
-            CONDITION@[18; 22)
-              LITERAL@[18; 22)
-                TRUE_KW@[18; 22) "true"
-            WHITESPACE@[22; 23) " "
-            BLOCK_EXPR@[23; 25)
-              BLOCK@[23; 25)
-                L_CURLY@[23; 24) "{"
-                R_CURLY@[24; 25) "}"
-          SEMICOLON@[25; 26) ";"
-        WHITESPACE@[26; 31) "\n    "
-        EXPR_STMT@[31; 50)
-          IF_EXPR@[31; 49)
-            IF_KW@[31; 33) "if"
-            WHITESPACE@[33; 34) " "
-            CONDITION@[34; 38)
-              LITERAL@[34; 38)
-                TRUE_KW@[34; 38) "true"
-            WHITESPACE@[38; 39) " "
-            BLOCK_EXPR@[39; 41)
-              BLOCK@[39; 41)
-                L_CURLY@[39; 40) "{"
-                R_CURLY@[40; 41) "}"
-            WHITESPACE@[41; 42) " "
-            ELSE_KW@[42; 46) "else"
-            WHITESPACE@[46; 47) " "
-            BLOCK_EXPR@[47; 49)
-              BLOCK@[47; 49)
-                L_CURLY@[47; 48) "{"
-                R_CURLY@[48; 49) "}"
-          SEMICOLON@[49; 50) ";"
-        WHITESPACE@[50; 55) "\n    "
-        EXPR_STMT@[55; 91)
-          IF_EXPR@[55; 90)
-            IF_KW@[55; 57) "if"
-            WHITESPACE@[57; 58) " "
-            CONDITION@[58; 62)
-              LITERAL@[58; 62)
-                TRUE_KW@[58; 62) "true"
-            WHITESPACE@[62; 63) " "
-            BLOCK_EXPR@[63; 65)
-              BLOCK@[63; 65)
-                L_CURLY@[63; 64) "{"
-                R_CURLY@[64; 65) "}"
-            WHITESPACE@[65; 66) " "
-            ELSE_KW@[66; 70) "else"
-            WHITESPACE@[70; 71) " "
-            IF_EXPR@[71; 90)
-              IF_KW@[71; 73) "if"
-              WHITESPACE@[73; 74) " "
-              CONDITION@[74; 79)
-                LITERAL@[74; 79)
-                  FALSE_KW@[74; 79) "false"
-              WHITESPACE@[79; 80) " "
-              BLOCK_EXPR@[80; 82)
-                BLOCK@[80; 82)
-                  L_CURLY@[80; 81) "{"
-                  R_CURLY@[81; 82) "}"
-              WHITESPACE@[82; 83) " "
-              ELSE_KW@[83; 87) "else"
-              WHITESPACE@[87; 88) " "
-              BLOCK_EXPR@[88; 90)
-                BLOCK@[88; 90)
-                  L_CURLY@[88; 89) "{"
-                  R_CURLY@[89; 90) "}"
-          SEMICOLON@[90; 91) ";"
-        WHITESPACE@[91; 96) "\n    "
-        EXPR_STMT@[96; 104)
-          IF_EXPR@[96; 103)
-            IF_KW@[96; 98) "if"
-            WHITESPACE@[98; 99) " "
-            CONDITION@[99; 100)
-              PATH_EXPR@[99; 100)
-                PATH@[99; 100)
-                  PATH_SEGMENT@[99; 100)
-                    NAME_REF@[99; 100)
-                      IDENT@[99; 100) "S"
-            WHITESPACE@[100; 101) " "
-            BLOCK_EXPR@[101; 103)
-              BLOCK@[101; 103)
-                L_CURLY@[101; 102) "{"
-                R_CURLY@[102; 103) "}"
-          SEMICOLON@[103; 104) ";"
-        WHITESPACE@[104; 109) "\n    "
-        EXPR_STMT@[109; 134)
-          IF_EXPR@[109; 133)
-            IF_KW@[109; 111) "if"
-            WHITESPACE@[111; 112) " "
-            CONDITION@[112; 120)
-              BLOCK_EXPR@[112; 120)
-                BLOCK@[112; 120)
-                  L_CURLY@[112; 113) "{"
-                  WHITESPACE@[113; 114) " "
-                  LITERAL@[114; 118)
-                    TRUE_KW@[114; 118) "true"
-                  WHITESPACE@[118; 119) " "
-                  R_CURLY@[119; 120) "}"
-            WHITESPACE@[120; 121) " "
-            BLOCK_EXPR@[121; 124)
-              BLOCK@[121; 124)
-                L_CURLY@[121; 122) "{"
-                WHITESPACE@[122; 123) " "
-                R_CURLY@[123; 124) "}"
-            WHITESPACE@[124; 125) " "
-            ELSE_KW@[125; 129) "else"
-            WHITESPACE@[129; 130) " "
-            BLOCK_EXPR@[130; 133)
-              BLOCK@[130; 133)
-                L_CURLY@[130; 131) "{"
-                WHITESPACE@[131; 132) " "
-                R_CURLY@[132; 133) "}"
-          SEMICOLON@[133; 134) ";"
-        WHITESPACE@[134; 135) "\n"
-        R_CURLY@[135; 136) "}"
-  WHITESPACE@[136; 137) "\n"
+SOURCE_FILE@0..137
+  FN_DEF@0..136
+    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..136
+      BLOCK@9..136
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..26
+          IF_EXPR@15..25
+            IF_KW@15..17 "if"
+            WHITESPACE@17..18 " "
+            CONDITION@18..22
+              LITERAL@18..22
+                TRUE_KW@18..22 "true"
+            WHITESPACE@22..23 " "
+            BLOCK_EXPR@23..25
+              BLOCK@23..25
+                L_CURLY@23..24 "{"
+                R_CURLY@24..25 "}"
+          SEMICOLON@25..26 ";"
+        WHITESPACE@26..31 "\n    "
+        EXPR_STMT@31..50
+          IF_EXPR@31..49
+            IF_KW@31..33 "if"
+            WHITESPACE@33..34 " "
+            CONDITION@34..38
+              LITERAL@34..38
+                TRUE_KW@34..38 "true"
+            WHITESPACE@38..39 " "
+            BLOCK_EXPR@39..41
+              BLOCK@39..41
+                L_CURLY@39..40 "{"
+                R_CURLY@40..41 "}"
+            WHITESPACE@41..42 " "
+            ELSE_KW@42..46 "else"
+            WHITESPACE@46..47 " "
+            BLOCK_EXPR@47..49
+              BLOCK@47..49
+                L_CURLY@47..48 "{"
+                R_CURLY@48..49 "}"
+          SEMICOLON@49..50 ";"
+        WHITESPACE@50..55 "\n    "
+        EXPR_STMT@55..91
+          IF_EXPR@55..90
+            IF_KW@55..57 "if"
+            WHITESPACE@57..58 " "
+            CONDITION@58..62
+              LITERAL@58..62
+                TRUE_KW@58..62 "true"
+            WHITESPACE@62..63 " "
+            BLOCK_EXPR@63..65
+              BLOCK@63..65
+                L_CURLY@63..64 "{"
+                R_CURLY@64..65 "}"
+            WHITESPACE@65..66 " "
+            ELSE_KW@66..70 "else"
+            WHITESPACE@70..71 " "
+            IF_EXPR@71..90
+              IF_KW@71..73 "if"
+              WHITESPACE@73..74 " "
+              CONDITION@74..79
+                LITERAL@74..79
+                  FALSE_KW@74..79 "false"
+              WHITESPACE@79..80 " "
+              BLOCK_EXPR@80..82
+                BLOCK@80..82
+                  L_CURLY@80..81 "{"
+                  R_CURLY@81..82 "}"
+              WHITESPACE@82..83 " "
+              ELSE_KW@83..87 "else"
+              WHITESPACE@87..88 " "
+              BLOCK_EXPR@88..90
+                BLOCK@88..90
+                  L_CURLY@88..89 "{"
+                  R_CURLY@89..90 "}"
+          SEMICOLON@90..91 ";"
+        WHITESPACE@91..96 "\n    "
+        EXPR_STMT@96..104
+          IF_EXPR@96..103
+            IF_KW@96..98 "if"
+            WHITESPACE@98..99 " "
+            CONDITION@99..100
+              PATH_EXPR@99..100
+                PATH@99..100
+                  PATH_SEGMENT@99..100
+                    NAME_REF@99..100
+                      IDENT@99..100 "S"
+            WHITESPACE@100..101 " "
+            BLOCK_EXPR@101..103
+              BLOCK@101..103
+                L_CURLY@101..102 "{"
+                R_CURLY@102..103 "}"
+          SEMICOLON@103..104 ";"
+        WHITESPACE@104..109 "\n    "
+        EXPR_STMT@109..134
+          IF_EXPR@109..133
+            IF_KW@109..111 "if"
+            WHITESPACE@111..112 " "
+            CONDITION@112..120
+              BLOCK_EXPR@112..120
+                BLOCK@112..120
+                  L_CURLY@112..113 "{"
+                  WHITESPACE@113..114 " "
+                  LITERAL@114..118
+                    TRUE_KW@114..118 "true"
+                  WHITESPACE@118..119 " "
+                  R_CURLY@119..120 "}"
+            WHITESPACE@120..121 " "
+            BLOCK_EXPR@121..124
+              BLOCK@121..124
+                L_CURLY@121..122 "{"
+                WHITESPACE@122..123 " "
+                R_CURLY@123..124 "}"
+            WHITESPACE@124..125 " "
+            ELSE_KW@125..129 "else"
+            WHITESPACE@129..130 " "
+            BLOCK_EXPR@130..133
+              BLOCK@130..133
+                L_CURLY@130..131 "{"
+                WHITESPACE@131..132 " "
+                R_CURLY@132..133 "}"
+          SEMICOLON@133..134 ";"
+        WHITESPACE@134..135 "\n"
+        R_CURLY@135..136 "}"
+  WHITESPACE@136..137 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index bbf347580..8e10f3673 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -1,43 +1,43 @@
-SOURCE_FILE@[0; 42)
-  TYPE_ALIAS_DEF@[0; 41)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    DYN_TRAIT_TYPE@[9; 40)
-      DYN_KW@[9; 12) "dyn"
-      WHITESPACE@[12; 13) " "
-      TYPE_BOUND_LIST@[13; 40)
-        TYPE_BOUND@[13; 35)
-          PATH_TYPE@[13; 35)
-            PATH@[13; 35)
-              PATH_SEGMENT@[13; 35)
-                NAME_REF@[13; 21)
-                  IDENT@[13; 21) "Iterator"
-                TYPE_ARG_LIST@[21; 35)
-                  L_ANGLE@[21; 22) "<"
-                  ASSOC_TYPE_ARG@[22; 34)
-                    NAME_REF@[22; 26)
-                      IDENT@[22; 26) "Item"
-                    EQ@[26; 27) "="
-                    PATH_TYPE@[27; 34)
-                      PATH@[27; 34)
-                        PATH_SEGMENT@[27; 34)
-                          NAME_REF@[27; 30)
-                            IDENT@[27; 30) "Foo"
-                          TYPE_ARG_LIST@[30; 34)
-                            L_ANGLE@[30; 31) "<"
-                            LIFETIME_ARG@[31; 33)
-                              LIFETIME@[31; 33) "\'a"
-                            R_ANGLE@[33; 34) ">"
-                  R_ANGLE@[34; 35) ">"
-        WHITESPACE@[35; 36) " "
-        PLUS@[36; 37) "+"
-        WHITESPACE@[37; 38) " "
-        TYPE_BOUND@[38; 40)
-          LIFETIME@[38; 40) "\'a"
-    SEMICOLON@[40; 41) ";"
-  WHITESPACE@[41; 42) "\n"
+SOURCE_FILE@0..42
+  TYPE_ALIAS_DEF@0..41
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    DYN_TRAIT_TYPE@9..40
+      DYN_KW@9..12 "dyn"
+      WHITESPACE@12..13 " "
+      TYPE_BOUND_LIST@13..40
+        TYPE_BOUND@13..35
+          PATH_TYPE@13..35
+            PATH@13..35
+              PATH_SEGMENT@13..35
+                NAME_REF@13..21
+                  IDENT@13..21 "Iterator"
+                TYPE_ARG_LIST@21..35
+                  L_ANGLE@21..22 "<"
+                  ASSOC_TYPE_ARG@22..34
+                    NAME_REF@22..26
+                      IDENT@22..26 "Item"
+                    EQ@26..27 "="
+                    PATH_TYPE@27..34
+                      PATH@27..34
+                        PATH_SEGMENT@27..34
+                          NAME_REF@27..30
+                            IDENT@27..30 "Foo"
+                          TYPE_ARG_LIST@30..34
+                            L_ANGLE@30..31 "<"
+                            LIFETIME_ARG@31..33
+                              LIFETIME@31..33 "\'a"
+                            R_ANGLE@33..34 ">"
+                  R_ANGLE@34..35 ">"
+        WHITESPACE@35..36 " "
+        PLUS@36..37 "+"
+        WHITESPACE@37..38 " "
+        TYPE_BOUND@38..40
+          LIFETIME@38..40 "\'a"
+    SEMICOLON@40..41 ";"
+  WHITESPACE@41..42 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 85edd0845..108e5c5cc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
@@ -1,152 +1,152 @@
-SOURCE_FILE@[0; 167)
-  FN_DEF@[0; 166)
-    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; 166)
-      BLOCK@[9; 166)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 164)
-          MATCH_EXPR@[15; 163)
-            MATCH_KW@[15; 20) "match"
-            WHITESPACE@[20; 21) " "
-            TUPLE_EXPR@[21; 23)
-              L_PAREN@[21; 22) "("
-              R_PAREN@[22; 23) ")"
-            WHITESPACE@[23; 24) " "
-            MATCH_ARM_LIST@[24; 163)
-              L_CURLY@[24; 25) "{"
-              WHITESPACE@[25; 34) "\n        "
-              MATCH_ARM@[34; 41)
-                PLACEHOLDER_PAT@[34; 35)
-                  UNDERSCORE@[34; 35) "_"
-                WHITESPACE@[35; 36) " "
-                FAT_ARROW@[36; 38) "=>"
-                WHITESPACE@[38; 39) " "
-                TUPLE_EXPR@[39; 41)
-                  L_PAREN@[39; 40) "("
-                  R_PAREN@[40; 41) ")"
-              COMMA@[41; 42) ","
-              WHITESPACE@[42; 51) "\n        "
-              MATCH_ARM@[51; 83)
-                PLACEHOLDER_PAT@[51; 52)
-                  UNDERSCORE@[51; 52) "_"
-                WHITESPACE@[52; 53) " "
-                MATCH_GUARD@[53; 77)
-                  IF_KW@[53; 55) "if"
-                  WHITESPACE@[55; 56) " "
-                  BIN_EXPR@[56; 77)
-                    PATH_EXPR@[56; 60)
-                      PATH@[56; 60)
-                        PATH_SEGMENT@[56; 60)
-                          NAME_REF@[56; 60)
-                            IDENT@[56; 60) "Test"
-                    WHITESPACE@[60; 61) " "
-                    R_ANGLE@[61; 62) ">"
-                    WHITESPACE@[62; 63) " "
-                    RECORD_LIT@[63; 77)
-                      PATH@[63; 67)
-                        PATH_SEGMENT@[63; 67)
-                          NAME_REF@[63; 67)
-                            IDENT@[63; 67) "Test"
-                      RECORD_FIELD_LIST@[67; 77)
-                        L_CURLY@[67; 68) "{"
-                        RECORD_FIELD@[68; 76)
-                          NAME_REF@[68; 73)
-                            IDENT@[68; 73) "field"
-                          COLON@[73; 74) ":"
-                          WHITESPACE@[74; 75) " "
-                          LITERAL@[75; 76)
-                            INT_NUMBER@[75; 76) "0"
-                        R_CURLY@[76; 77) "}"
-                WHITESPACE@[77; 78) " "
-                FAT_ARROW@[78; 80) "=>"
-                WHITESPACE@[80; 81) " "
-                TUPLE_EXPR@[81; 83)
-                  L_PAREN@[81; 82) "("
-                  R_PAREN@[82; 83) ")"
-              COMMA@[83; 84) ","
-              WHITESPACE@[84; 93) "\n        "
-              MATCH_ARM@[93; 109)
-                OR_PAT@[93; 98)
-                  BIND_PAT@[93; 94)
-                    NAME@[93; 94)
-                      IDENT@[93; 94) "X"
-                  WHITESPACE@[94; 95) " "
-                  PIPE@[95; 96) "|"
-                  WHITESPACE@[96; 97) " "
-                  BIND_PAT@[97; 98)
-                    NAME@[97; 98)
-                      IDENT@[97; 98) "Y"
-                WHITESPACE@[98; 99) " "
-                MATCH_GUARD@[99; 103)
-                  IF_KW@[99; 101) "if"
-                  WHITESPACE@[101; 102) " "
-                  PATH_EXPR@[102; 103)
-                    PATH@[102; 103)
-                      PATH_SEGMENT@[102; 103)
-                        NAME_REF@[102; 103)
-                          IDENT@[102; 103) "Z"
-                WHITESPACE@[103; 104) " "
-                FAT_ARROW@[104; 106) "=>"
-                WHITESPACE@[106; 107) " "
-                TUPLE_EXPR@[107; 109)
-                  L_PAREN@[107; 108) "("
-                  R_PAREN@[108; 109) ")"
-              COMMA@[109; 110) ","
-              WHITESPACE@[110; 119) "\n        "
-              MATCH_ARM@[119; 137)
-                PIPE@[119; 120) "|"
-                WHITESPACE@[120; 121) " "
-                OR_PAT@[121; 126)
-                  BIND_PAT@[121; 122)
-                    NAME@[121; 122)
-                      IDENT@[121; 122) "X"
-                  WHITESPACE@[122; 123) " "
-                  PIPE@[123; 124) "|"
-                  WHITESPACE@[124; 125) " "
-                  BIND_PAT@[125; 126)
-                    NAME@[125; 126)
-                      IDENT@[125; 126) "Y"
-                WHITESPACE@[126; 127) " "
-                MATCH_GUARD@[127; 131)
-                  IF_KW@[127; 129) "if"
-                  WHITESPACE@[129; 130) " "
-                  PATH_EXPR@[130; 131)
-                    PATH@[130; 131)
-                      PATH_SEGMENT@[130; 131)
-                        NAME_REF@[130; 131)
-                          IDENT@[130; 131) "Z"
-                WHITESPACE@[131; 132) " "
-                FAT_ARROW@[132; 134) "=>"
-                WHITESPACE@[134; 135) " "
-                TUPLE_EXPR@[135; 137)
-                  L_PAREN@[135; 136) "("
-                  R_PAREN@[136; 137) ")"
-              COMMA@[137; 138) ","
-              WHITESPACE@[138; 147) "\n        "
-              MATCH_ARM@[147; 156)
-                PIPE@[147; 148) "|"
-                WHITESPACE@[148; 149) " "
-                BIND_PAT@[149; 150)
-                  NAME@[149; 150)
-                    IDENT@[149; 150) "X"
-                WHITESPACE@[150; 151) " "
-                FAT_ARROW@[151; 153) "=>"
-                WHITESPACE@[153; 154) " "
-                TUPLE_EXPR@[154; 156)
-                  L_PAREN@[154; 155) "("
-                  R_PAREN@[155; 156) ")"
-              COMMA@[156; 157) ","
-              WHITESPACE@[157; 162) "\n    "
-              R_CURLY@[162; 163) "}"
-          SEMICOLON@[163; 164) ";"
-        WHITESPACE@[164; 165) "\n"
-        R_CURLY@[165; 166) "}"
-  WHITESPACE@[166; 167) "\n"
+SOURCE_FILE@0..167
+  FN_DEF@0..166
+    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..166
+      BLOCK@9..166
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..164
+          MATCH_EXPR@15..163
+            MATCH_KW@15..20 "match"
+            WHITESPACE@20..21 " "
+            TUPLE_EXPR@21..23
+              L_PAREN@21..22 "("
+              R_PAREN@22..23 ")"
+            WHITESPACE@23..24 " "
+            MATCH_ARM_LIST@24..163
+              L_CURLY@24..25 "{"
+              WHITESPACE@25..34 "\n        "
+              MATCH_ARM@34..41
+                PLACEHOLDER_PAT@34..35
+                  UNDERSCORE@34..35 "_"
+                WHITESPACE@35..36 " "
+                FAT_ARROW@36..38 "=>"
+                WHITESPACE@38..39 " "
+                TUPLE_EXPR@39..41
+                  L_PAREN@39..40 "("
+                  R_PAREN@40..41 ")"
+              COMMA@41..42 ","
+              WHITESPACE@42..51 "\n        "
+              MATCH_ARM@51..83
+                PLACEHOLDER_PAT@51..52
+                  UNDERSCORE@51..52 "_"
+                WHITESPACE@52..53 " "
+                MATCH_GUARD@53..77
+                  IF_KW@53..55 "if"
+                  WHITESPACE@55..56 " "
+                  BIN_EXPR@56..77
+                    PATH_EXPR@56..60
+                      PATH@56..60
+                        PATH_SEGMENT@56..60
+                          NAME_REF@56..60
+                            IDENT@56..60 "Test"
+                    WHITESPACE@60..61 " "
+                    R_ANGLE@61..62 ">"
+                    WHITESPACE@62..63 " "
+                    RECORD_LIT@63..77
+                      PATH@63..67
+                        PATH_SEGMENT@63..67
+                          NAME_REF@63..67
+                            IDENT@63..67 "Test"
+                      RECORD_FIELD_LIST@67..77
+                        L_CURLY@67..68 "{"
+                        RECORD_FIELD@68..76
+                          NAME_REF@68..73
+                            IDENT@68..73 "field"
+                          COLON@73..74 ":"
+                          WHITESPACE@74..75 " "
+                          LITERAL@75..76
+                            INT_NUMBER@75..76 "0"
+                        R_CURLY@76..77 "}"
+                WHITESPACE@77..78 " "
+                FAT_ARROW@78..80 "=>"
+                WHITESPACE@80..81 " "
+                TUPLE_EXPR@81..83
+                  L_PAREN@81..82 "("
+                  R_PAREN@82..83 ")"
+              COMMA@83..84 ","
+              WHITESPACE@84..93 "\n        "
+              MATCH_ARM@93..109
+                OR_PAT@93..98
+                  BIND_PAT@93..94
+                    NAME@93..94
+                      IDENT@93..94 "X"
+                  WHITESPACE@94..95 " "
+                  PIPE@95..96 "|"
+                  WHITESPACE@96..97 " "
+                  BIND_PAT@97..98
+                    NAME@97..98
+                      IDENT@97..98 "Y"
+                WHITESPACE@98..99 " "
+                MATCH_GUARD@99..103
+                  IF_KW@99..101 "if"
+                  WHITESPACE@101..102 " "
+                  PATH_EXPR@102..103
+                    PATH@102..103
+                      PATH_SEGMENT@102..103
+                        NAME_REF@102..103
+                          IDENT@102..103 "Z"
+                WHITESPACE@103..104 " "
+                FAT_ARROW@104..106 "=>"
+                WHITESPACE@106..107 " "
+                TUPLE_EXPR@107..109
+                  L_PAREN@107..108 "("
+                  R_PAREN@108..109 ")"
+              COMMA@109..110 ","
+              WHITESPACE@110..119 "\n        "
+              MATCH_ARM@119..137
+                PIPE@119..120 "|"
+                WHITESPACE@120..121 " "
+                OR_PAT@121..126
+                  BIND_PAT@121..122
+                    NAME@121..122
+                      IDENT@121..122 "X"
+                  WHITESPACE@122..123 " "
+                  PIPE@123..124 "|"
+                  WHITESPACE@124..125 " "
+                  BIND_PAT@125..126
+                    NAME@125..126
+                      IDENT@125..126 "Y"
+                WHITESPACE@126..127 " "
+                MATCH_GUARD@127..131
+                  IF_KW@127..129 "if"
+                  WHITESPACE@129..130 " "
+                  PATH_EXPR@130..131
+                    PATH@130..131
+                      PATH_SEGMENT@130..131
+                        NAME_REF@130..131
+                          IDENT@130..131 "Z"
+                WHITESPACE@131..132 " "
+                FAT_ARROW@132..134 "=>"
+                WHITESPACE@134..135 " "
+                TUPLE_EXPR@135..137
+                  L_PAREN@135..136 "("
+                  R_PAREN@136..137 ")"
+              COMMA@137..138 ","
+              WHITESPACE@138..147 "\n        "
+              MATCH_ARM@147..156
+                PIPE@147..148 "|"
+                WHITESPACE@148..149 " "
+                BIND_PAT@149..150
+                  NAME@149..150
+                    IDENT@149..150 "X"
+                WHITESPACE@150..151 " "
+                FAT_ARROW@151..153 "=>"
+                WHITESPACE@153..154 " "
+                TUPLE_EXPR@154..156
+                  L_PAREN@154..155 "("
+                  R_PAREN@155..156 ")"
+              COMMA@156..157 ","
+              WHITESPACE@157..162 "\n    "
+              R_CURLY@162..163 "}"
+          SEMICOLON@163..164 ";"
+        WHITESPACE@164..165 "\n"
+        R_CURLY@165..166 "}"
+  WHITESPACE@166..167 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
index 35994e3fd..caa76fe8a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -1,15 +1,15 @@
-SOURCE_FILE@[0; 16)
-  USE_ITEM@[0; 15)
-    USE_KW@[0; 3) "use"
-    WHITESPACE@[3; 4) " "
-    USE_TREE@[4; 14)
-      PATH@[4; 14)
-        PATH@[4; 9)
-          PATH_SEGMENT@[4; 9)
-            CRATE_KW@[4; 9) "crate"
-        COLON2@[9; 11) "::"
-        PATH_SEGMENT@[11; 14)
-          NAME_REF@[11; 14)
-            IDENT@[11; 14) "foo"
-    SEMICOLON@[14; 15) ";"
-  WHITESPACE@[15; 16) "\n"
+SOURCE_FILE@0..16
+  USE_ITEM@0..15
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..14
+      PATH@4..14
+        PATH@4..9
+          PATH_SEGMENT@4..9
+            CRATE_KW@4..9 "crate"
+        COLON2@9..11 "::"
+        PATH_SEGMENT@11..14
+          NAME_REF@11..14
+            IDENT@11..14 "foo"
+    SEMICOLON@14..15 ";"
+  WHITESPACE@15..16 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
index 9d7982684..ec2496072 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
@@ -1,46 +1,46 @@
-SOURCE_FILE@[0; 51)
-  UNION_DEF@[0; 12)
-    UNION_KW@[0; 5) "union"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 9)
-      IDENT@[6; 9) "Foo"
-    WHITESPACE@[9; 10) " "
-    RECORD_FIELD_DEF_LIST@[10; 12)
-      L_CURLY@[10; 11) "{"
-      R_CURLY@[11; 12) "}"
-  WHITESPACE@[12; 13) "\n"
-  UNION_DEF@[13; 50)
-    UNION_KW@[13; 18) "union"
-    WHITESPACE@[18; 19) " "
-    NAME@[19; 22)
-      IDENT@[19; 22) "Foo"
-    WHITESPACE@[22; 23) " "
-    RECORD_FIELD_DEF_LIST@[23; 50)
-      L_CURLY@[23; 24) "{"
-      WHITESPACE@[24; 29) "\n    "
-      RECORD_FIELD_DEF@[29; 35)
-        NAME@[29; 30)
-          IDENT@[29; 30) "a"
-        COLON@[30; 31) ":"
-        WHITESPACE@[31; 32) " "
-        PATH_TYPE@[32; 35)
-          PATH@[32; 35)
-            PATH_SEGMENT@[32; 35)
-              NAME_REF@[32; 35)
-                IDENT@[32; 35) "i32"
-      COMMA@[35; 36) ","
-      WHITESPACE@[36; 41) "\n    "
-      RECORD_FIELD_DEF@[41; 47)
-        NAME@[41; 42)
-          IDENT@[41; 42) "b"
-        COLON@[42; 43) ":"
-        WHITESPACE@[43; 44) " "
-        PATH_TYPE@[44; 47)
-          PATH@[44; 47)
-            PATH_SEGMENT@[44; 47)
-              NAME_REF@[44; 47)
-                IDENT@[44; 47) "f32"
-      COMMA@[47; 48) ","
-      WHITESPACE@[48; 49) "\n"
-      R_CURLY@[49; 50) "}"
-  WHITESPACE@[50; 51) "\n"
+SOURCE_FILE@0..51
+  UNION_DEF@0..12
+    UNION_KW@0..5 "union"
+    WHITESPACE@5..6 " "
+    NAME@6..9
+      IDENT@6..9 "Foo"
+    WHITESPACE@9..10 " "
+    RECORD_FIELD_DEF_LIST@10..12
+      L_CURLY@10..11 "{"
+      R_CURLY@11..12 "}"
+  WHITESPACE@12..13 "\n"
+  UNION_DEF@13..50
+    UNION_KW@13..18 "union"
+    WHITESPACE@18..19 " "
+    NAME@19..22
+      IDENT@19..22 "Foo"
+    WHITESPACE@22..23 " "
+    RECORD_FIELD_DEF_LIST@23..50
+      L_CURLY@23..24 "{"
+      WHITESPACE@24..29 "\n    "
+      RECORD_FIELD_DEF@29..35
+        NAME@29..30
+          IDENT@29..30 "a"
+        COLON@30..31 ":"
+        WHITESPACE@31..32 " "
+        PATH_TYPE@32..35
+          PATH@32..35
+            PATH_SEGMENT@32..35
+              NAME_REF@32..35
+                IDENT@32..35 "i32"
+      COMMA@35..36 ","
+      WHITESPACE@36..41 "\n    "
+      RECORD_FIELD_DEF@41..47
+        NAME@41..42
+          IDENT@41..42 "b"
+        COLON@42..43 ":"
+        WHITESPACE@43..44 " "
+        PATH_TYPE@44..47
+          PATH@44..47
+            PATH_SEGMENT@44..47
+              NAME_REF@44..47
+                IDENT@44..47 "f32"
+      COMMA@47..48 ","
+      WHITESPACE@48..49 "\n"
+      R_CURLY@49..50 "}"
+  WHITESPACE@50..51 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index e24247890..18cd5271f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -1,37 +1,37 @@
-SOURCE_FILE@[0; 37)
-  USE_ITEM@[0; 18)
-    USE_KW@[0; 3) "use"
-    WHITESPACE@[3; 4) " "
-    USE_TREE@[4; 17)
-      PATH@[4; 9)
-        PATH_SEGMENT@[4; 9)
-          CRATE_KW@[4; 9) "crate"
-      COLON2@[9; 11) "::"
-      USE_TREE_LIST@[11; 17)
-        L_CURLY@[11; 12) "{"
-        USE_TREE@[12; 16)
-          PATH@[12; 16)
-            PATH_SEGMENT@[12; 16)
-              NAME_REF@[12; 16)
-                IDENT@[12; 16) "Item"
-        R_CURLY@[16; 17) "}"
-    SEMICOLON@[17; 18) ";"
-  WHITESPACE@[18; 19) "\n"
-  USE_ITEM@[19; 36)
-    USE_KW@[19; 22) "use"
-    WHITESPACE@[22; 23) " "
-    USE_TREE@[23; 35)
-      PATH@[23; 27)
-        PATH_SEGMENT@[23; 27)
-          SELF_KW@[23; 27) "self"
-      COLON2@[27; 29) "::"
-      USE_TREE_LIST@[29; 35)
-        L_CURLY@[29; 30) "{"
-        USE_TREE@[30; 34)
-          PATH@[30; 34)
-            PATH_SEGMENT@[30; 34)
-              NAME_REF@[30; 34)
-                IDENT@[30; 34) "Item"
-        R_CURLY@[34; 35) "}"
-    SEMICOLON@[35; 36) ";"
-  WHITESPACE@[36; 37) "\n"
+SOURCE_FILE@0..37
+  USE_ITEM@0..18
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..17
+      PATH@4..9
+        PATH_SEGMENT@4..9
+          CRATE_KW@4..9 "crate"
+      COLON2@9..11 "::"
+      USE_TREE_LIST@11..17
+        L_CURLY@11..12 "{"
+        USE_TREE@12..16
+          PATH@12..16
+            PATH_SEGMENT@12..16
+              NAME_REF@12..16
+                IDENT@12..16 "Item"
+        R_CURLY@16..17 "}"
+    SEMICOLON@17..18 ";"
+  WHITESPACE@18..19 "\n"
+  USE_ITEM@19..36
+    USE_KW@19..22 "use"
+    WHITESPACE@22..23 " "
+    USE_TREE@23..35
+      PATH@23..27
+        PATH_SEGMENT@23..27
+          SELF_KW@23..27 "self"
+      COLON2@27..29 "::"
+      USE_TREE_LIST@29..35
+        L_CURLY@29..30 "{"
+        USE_TREE@30..34
+          PATH@30..34
+            PATH_SEGMENT@30..34
+              NAME_REF@30..34
+                IDENT@30..34 "Item"
+        R_CURLY@34..35 "}"
+    SEMICOLON@35..36 ";"
+  WHITESPACE@36..37 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index 4b075569a..1e888063e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
@@ -1,53 +1,53 @@
-SOURCE_FILE@[0; 46)
-  FN_DEF@[0; 45)
-    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; 45)
-      BLOCK@[9; 45)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 31)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          BIN_EXPR@[23; 30)
-            BLOCK_EXPR@[23; 26)
-              BLOCK@[23; 26)
-                L_CURLY@[23; 24) "{"
-                LITERAL@[24; 25)
-                  INT_NUMBER@[24; 25) "1"
-                R_CURLY@[25; 26) "}"
-            WHITESPACE@[26; 27) " "
-            AMP@[27; 28) "&"
-            WHITESPACE@[28; 29) " "
-            LITERAL@[29; 30)
-              INT_NUMBER@[29; 30) "2"
-          SEMICOLON@[30; 31) ";"
-        WHITESPACE@[31; 36) "\n    "
-        EXPR_STMT@[36; 39)
-          BLOCK_EXPR@[36; 39)
-            BLOCK@[36; 39)
-              L_CURLY@[36; 37) "{"
-              LITERAL@[37; 38)
-                INT_NUMBER@[37; 38) "1"
-              R_CURLY@[38; 39) "}"
-        WHITESPACE@[39; 40) " "
-        EXPR_STMT@[40; 43)
-          REF_EXPR@[40; 42)
-            AMP@[40; 41) "&"
-            LITERAL@[41; 42)
-              INT_NUMBER@[41; 42) "2"
-          SEMICOLON@[42; 43) ";"
-        WHITESPACE@[43; 44) "\n"
-        R_CURLY@[44; 45) "}"
-  WHITESPACE@[45; 46) "\n"
+SOURCE_FILE@0..46
+  FN_DEF@0..45
+    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..45
+      BLOCK@9..45
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..31
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          BIN_EXPR@23..30
+            BLOCK_EXPR@23..26
+              BLOCK@23..26
+                L_CURLY@23..24 "{"
+                LITERAL@24..25
+                  INT_NUMBER@24..25 "1"
+                R_CURLY@25..26 "}"
+            WHITESPACE@26..27 " "
+            AMP@27..28 "&"
+            WHITESPACE@28..29 " "
+            LITERAL@29..30
+              INT_NUMBER@29..30 "2"
+          SEMICOLON@30..31 ";"
+        WHITESPACE@31..36 "\n    "
+        EXPR_STMT@36..39
+          BLOCK_EXPR@36..39
+            BLOCK@36..39
+              L_CURLY@36..37 "{"
+              LITERAL@37..38
+                INT_NUMBER@37..38 "1"
+              R_CURLY@38..39 "}"
+        WHITESPACE@39..40 " "
+        EXPR_STMT@40..43
+          REF_EXPR@40..42
+            AMP@40..41 "&"
+            LITERAL@41..42
+              INT_NUMBER@41..42 "2"
+          SEMICOLON@42..43 ";"
+        WHITESPACE@43..44 "\n"
+        R_CURLY@44..45 "}"
+  WHITESPACE@45..46 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
index 559ffb578..218b3ec9e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
@@ -1,96 +1,96 @@
-SOURCE_FILE@[0; 97)
-  FN_DEF@[0; 96)
-    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; 96)
-      BLOCK@[9; 96)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 28)
-          MATCH_EXPR@[15; 27)
-            MATCH_KW@[15; 20) "match"
-            WHITESPACE@[20; 21) " "
-            TUPLE_EXPR@[21; 23)
-              L_PAREN@[21; 22) "("
-              R_PAREN@[22; 23) ")"
-            WHITESPACE@[23; 24) " "
-            MATCH_ARM_LIST@[24; 27)
-              L_CURLY@[24; 25) "{"
-              WHITESPACE@[25; 26) " "
-              R_CURLY@[26; 27) "}"
-          SEMICOLON@[27; 28) ";"
-        WHITESPACE@[28; 33) "\n    "
-        EXPR_STMT@[33; 44)
-          MATCH_EXPR@[33; 43)
-            MATCH_KW@[33; 38) "match"
-            WHITESPACE@[38; 39) " "
-            PATH_EXPR@[39; 40)
-              PATH@[39; 40)
-                PATH_SEGMENT@[39; 40)
-                  NAME_REF@[39; 40)
-                    IDENT@[39; 40) "S"
-            WHITESPACE@[40; 41) " "
-            MATCH_ARM_LIST@[41; 43)
-              L_CURLY@[41; 42) "{"
-              R_CURLY@[42; 43) "}"
-          SEMICOLON@[43; 44) ";"
-        WHITESPACE@[44; 49) "\n    "
-        EXPR_STMT@[49; 71)
-          MATCH_EXPR@[49; 70)
-            MATCH_KW@[49; 54) "match"
-            WHITESPACE@[54; 55) " "
-            BLOCK_EXPR@[55; 58)
-              BLOCK@[55; 58)
-                L_CURLY@[55; 56) "{"
-                WHITESPACE@[56; 57) " "
-                R_CURLY@[57; 58) "}"
-            WHITESPACE@[58; 59) " "
-            MATCH_ARM_LIST@[59; 70)
-              L_CURLY@[59; 60) "{"
-              WHITESPACE@[60; 61) " "
-              MATCH_ARM@[61; 68)
-                PLACEHOLDER_PAT@[61; 62)
-                  UNDERSCORE@[61; 62) "_"
-                WHITESPACE@[62; 63) " "
-                FAT_ARROW@[63; 65) "=>"
-                WHITESPACE@[65; 66) " "
-                TUPLE_EXPR@[66; 68)
-                  L_PAREN@[66; 67) "("
-                  R_PAREN@[67; 68) ")"
-              WHITESPACE@[68; 69) " "
-              R_CURLY@[69; 70) "}"
-          SEMICOLON@[70; 71) ";"
-        WHITESPACE@[71; 76) "\n    "
-        EXPR_STMT@[76; 94)
-          MATCH_EXPR@[76; 93)
-            MATCH_KW@[76; 81) "match"
-            WHITESPACE@[81; 82) " "
-            BLOCK_EXPR@[82; 90)
-              BLOCK@[82; 90)
-                L_CURLY@[82; 83) "{"
-                WHITESPACE@[83; 84) " "
-                RECORD_LIT@[84; 88)
-                  PATH@[84; 85)
-                    PATH_SEGMENT@[84; 85)
-                      NAME_REF@[84; 85)
-                        IDENT@[84; 85) "S"
-                  WHITESPACE@[85; 86) " "
-                  RECORD_FIELD_LIST@[86; 88)
-                    L_CURLY@[86; 87) "{"
-                    R_CURLY@[87; 88) "}"
-                WHITESPACE@[88; 89) " "
-                R_CURLY@[89; 90) "}"
-            WHITESPACE@[90; 91) " "
-            MATCH_ARM_LIST@[91; 93)
-              L_CURLY@[91; 92) "{"
-              R_CURLY@[92; 93) "}"
-          SEMICOLON@[93; 94) ";"
-        WHITESPACE@[94; 95) "\n"
-        R_CURLY@[95; 96) "}"
-  WHITESPACE@[96; 97) "\n"
+SOURCE_FILE@0..97
+  FN_DEF@0..96
+    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..96
+      BLOCK@9..96
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..28
+          MATCH_EXPR@15..27
+            MATCH_KW@15..20 "match"
+            WHITESPACE@20..21 " "
+            TUPLE_EXPR@21..23
+              L_PAREN@21..22 "("
+              R_PAREN@22..23 ")"
+            WHITESPACE@23..24 " "
+            MATCH_ARM_LIST@24..27
+              L_CURLY@24..25 "{"
+              WHITESPACE@25..26 " "
+              R_CURLY@26..27 "}"
+          SEMICOLON@27..28 ";"
+        WHITESPACE@28..33 "\n    "
+        EXPR_STMT@33..44
+          MATCH_EXPR@33..43
+            MATCH_KW@33..38 "match"
+            WHITESPACE@38..39 " "
+            PATH_EXPR@39..40
+              PATH@39..40
+                PATH_SEGMENT@39..40
+                  NAME_REF@39..40
+                    IDENT@39..40 "S"
+            WHITESPACE@40..41 " "
+            MATCH_ARM_LIST@41..43
+              L_CURLY@41..42 "{"
+              R_CURLY@42..43 "}"
+          SEMICOLON@43..44 ";"
+        WHITESPACE@44..49 "\n    "
+        EXPR_STMT@49..71
+          MATCH_EXPR@49..70
+            MATCH_KW@49..54 "match"
+            WHITESPACE@54..55 " "
+            BLOCK_EXPR@55..58
+              BLOCK@55..58
+                L_CURLY@55..56 "{"
+                WHITESPACE@56..57 " "
+                R_CURLY@57..58 "}"
+            WHITESPACE@58..59 " "
+            MATCH_ARM_LIST@59..70
+              L_CURLY@59..60 "{"
+              WHITESPACE@60..61 " "
+              MATCH_ARM@61..68
+                PLACEHOLDER_PAT@61..62
+                  UNDERSCORE@61..62 "_"
+                WHITESPACE@62..63 " "
+                FAT_ARROW@63..65 "=>"
+                WHITESPACE@65..66 " "
+                TUPLE_EXPR@66..68
+                  L_PAREN@66..67 "("
+                  R_PAREN@67..68 ")"
+              WHITESPACE@68..69 " "
+              R_CURLY@69..70 "}"
+          SEMICOLON@70..71 ";"
+        WHITESPACE@71..76 "\n    "
+        EXPR_STMT@76..94
+          MATCH_EXPR@76..93
+            MATCH_KW@76..81 "match"
+            WHITESPACE@81..82 " "
+            BLOCK_EXPR@82..90
+              BLOCK@82..90
+                L_CURLY@82..83 "{"
+                WHITESPACE@83..84 " "
+                RECORD_LIT@84..88
+                  PATH@84..85
+                    PATH_SEGMENT@84..85
+                      NAME_REF@84..85
+                        IDENT@84..85 "S"
+                  WHITESPACE@85..86 " "
+                  RECORD_FIELD_LIST@86..88
+                    L_CURLY@86..87 "{"
+                    R_CURLY@87..88 "}"
+                WHITESPACE@88..89 " "
+                R_CURLY@89..90 "}"
+            WHITESPACE@90..91 " "
+            MATCH_ARM_LIST@91..93
+              L_CURLY@91..92 "{"
+              R_CURLY@92..93 "}"
+          SEMICOLON@93..94 ";"
+        WHITESPACE@94..95 "\n"
+        R_CURLY@95..96 "}"
+  WHITESPACE@96..97 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
index 084efaee2..b8171dc9c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
@@ -1,29 +1,29 @@
-SOURCE_FILE@[0; 40)
-  FN_DEF@[0; 39)
-    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; 39)
-      BLOCK@[9; 39)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 22)
-          RETURN_EXPR@[15; 21)
-            RETURN_KW@[15; 21) "return"
-          SEMICOLON@[21; 22) ";"
-        WHITESPACE@[22; 27) "\n    "
-        EXPR_STMT@[27; 37)
-          RETURN_EXPR@[27; 36)
-            RETURN_KW@[27; 33) "return"
-            WHITESPACE@[33; 34) " "
-            LITERAL@[34; 36)
-              INT_NUMBER@[34; 36) "92"
-          SEMICOLON@[36; 37) ";"
-        WHITESPACE@[37; 38) "\n"
-        R_CURLY@[38; 39) "}"
-  WHITESPACE@[39; 40) "\n"
+SOURCE_FILE@0..40
+  FN_DEF@0..39
+    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..39
+      BLOCK@9..39
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..22
+          RETURN_EXPR@15..21
+            RETURN_KW@15..21 "return"
+          SEMICOLON@21..22 ";"
+        WHITESPACE@22..27 "\n    "
+        EXPR_STMT@27..37
+          RETURN_EXPR@27..36
+            RETURN_KW@27..33 "return"
+            WHITESPACE@33..34 " "
+            LITERAL@34..36
+              INT_NUMBER@34..36 "92"
+          SEMICOLON@36..37 ";"
+        WHITESPACE@37..38 "\n"
+        R_CURLY@38..39 "}"
+  WHITESPACE@39..40 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
index 64150b774..cc871ac0c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
@@ -1,20 +1,20 @@
-SOURCE_FILE@[0; 21)
-  TYPE_ALIAS_DEF@[0; 20)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 11)
-      IDENT@[5; 11) "Result"
-    TYPE_PARAM_LIST@[11; 14)
-      L_ANGLE@[11; 12) "<"
-      TYPE_PARAM@[12; 13)
-        NAME@[12; 13)
-          IDENT@[12; 13) "T"
-      R_ANGLE@[13; 14) ">"
-    WHITESPACE@[14; 15) " "
-    EQ@[15; 16) "="
-    WHITESPACE@[16; 17) " "
-    TUPLE_TYPE@[17; 19)
-      L_PAREN@[17; 18) "("
-      R_PAREN@[18; 19) ")"
-    SEMICOLON@[19; 20) ";"
-  WHITESPACE@[20; 21) "\n"
+SOURCE_FILE@0..21
+  TYPE_ALIAS_DEF@0..20
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..11
+      IDENT@5..11 "Result"
+    TYPE_PARAM_LIST@11..14
+      L_ANGLE@11..12 "<"
+      TYPE_PARAM@12..13
+        NAME@12..13
+          IDENT@12..13 "T"
+      R_ANGLE@13..14 ">"
+    WHITESPACE@14..15 " "
+    EQ@15..16 "="
+    WHITESPACE@16..17 " "
+    TUPLE_TYPE@17..19
+      L_PAREN@17..18 "("
+      R_PAREN@18..19 ")"
+    SEMICOLON@19..20 ";"
+  WHITESPACE@20..21 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index cbd2d5fbf..c2a73ef25 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
@@ -1,63 +1,63 @@
-SOURCE_FILE@[0; 84)
-  FN_DEF@[0; 83)
-    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; 83)
-      BLOCK@[9; 83)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        MATCH_EXPR@[15; 81)
-          MATCH_KW@[15; 20) "match"
-          WHITESPACE@[20; 21) " "
-          TUPLE_EXPR@[21; 23)
-            L_PAREN@[21; 22) "("
-            R_PAREN@[22; 23) ")"
-          WHITESPACE@[23; 24) " "
-          MATCH_ARM_LIST@[24; 81)
-            L_CURLY@[24; 25) "{"
-            WHITESPACE@[25; 34) "\n        "
-            MATCH_ARM@[34; 41)
-              PLACEHOLDER_PAT@[34; 35)
-                UNDERSCORE@[34; 35) "_"
-              WHITESPACE@[35; 36) " "
-              FAT_ARROW@[36; 38) "=>"
-              WHITESPACE@[38; 39) " "
-              BLOCK_EXPR@[39; 41)
-                BLOCK@[39; 41)
-                  L_CURLY@[39; 40) "{"
-                  R_CURLY@[40; 41) "}"
-            WHITESPACE@[41; 50) "\n        "
-            MATCH_ARM@[50; 58)
-              TUPLE_PAT@[50; 52)
-                L_PAREN@[50; 51) "("
-                R_PAREN@[51; 52) ")"
-              WHITESPACE@[52; 53) " "
-              FAT_ARROW@[53; 55) "=>"
-              WHITESPACE@[55; 56) " "
-              BLOCK_EXPR@[56; 58)
-                BLOCK@[56; 58)
-                  L_CURLY@[56; 57) "{"
-                  R_CURLY@[57; 58) "}"
-            WHITESPACE@[58; 67) "\n        "
-            MATCH_ARM@[67; 75)
-              SLICE_PAT@[67; 69)
-                L_BRACK@[67; 68) "["
-                R_BRACK@[68; 69) "]"
-              WHITESPACE@[69; 70) " "
-              FAT_ARROW@[70; 72) "=>"
-              WHITESPACE@[72; 73) " "
-              BLOCK_EXPR@[73; 75)
-                BLOCK@[73; 75)
-                  L_CURLY@[73; 74) "{"
-                  R_CURLY@[74; 75) "}"
-            WHITESPACE@[75; 80) "\n    "
-            R_CURLY@[80; 81) "}"
-        WHITESPACE@[81; 82) "\n"
-        R_CURLY@[82; 83) "}"
-  WHITESPACE@[83; 84) "\n"
+SOURCE_FILE@0..84
+  FN_DEF@0..83
+    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..83
+      BLOCK@9..83
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        MATCH_EXPR@15..81
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..81
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            MATCH_ARM@34..41
+              PLACEHOLDER_PAT@34..35
+                UNDERSCORE@34..35 "_"
+              WHITESPACE@35..36 " "
+              FAT_ARROW@36..38 "=>"
+              WHITESPACE@38..39 " "
+              BLOCK_EXPR@39..41
+                BLOCK@39..41
+                  L_CURLY@39..40 "{"
+                  R_CURLY@40..41 "}"
+            WHITESPACE@41..50 "\n        "
+            MATCH_ARM@50..58
+              TUPLE_PAT@50..52
+                L_PAREN@50..51 "("
+                R_PAREN@51..52 ")"
+              WHITESPACE@52..53 " "
+              FAT_ARROW@53..55 "=>"
+              WHITESPACE@55..56 " "
+              BLOCK_EXPR@56..58
+                BLOCK@56..58
+                  L_CURLY@56..57 "{"
+                  R_CURLY@57..58 "}"
+            WHITESPACE@58..67 "\n        "
+            MATCH_ARM@67..75
+              SLICE_PAT@67..69
+                L_BRACK@67..68 "["
+                R_BRACK@68..69 "]"
+              WHITESPACE@69..70 " "
+              FAT_ARROW@70..72 "=>"
+              WHITESPACE@72..73 " "
+              BLOCK_EXPR@73..75
+                BLOCK@73..75
+                  L_CURLY@73..74 "{"
+                  R_CURLY@74..75 "}"
+            WHITESPACE@75..80 "\n    "
+            R_CURLY@80..81 "}"
+        WHITESPACE@81..82 "\n"
+        R_CURLY@82..83 "}"
+  WHITESPACE@83..84 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
index 5c7cb4a88..39a86d002 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
@@ -1,90 +1,90 @@
-SOURCE_FILE@[0; 65)
-  FN_DEF@[0; 9)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 4)
-      IDENT@[3; 4) "a"
-    PARAM_LIST@[4; 6)
-      L_PAREN@[4; 5) "("
-      R_PAREN@[5; 6) ")"
-    WHITESPACE@[6; 7) " "
-    BLOCK_EXPR@[7; 9)
-      BLOCK@[7; 9)
-        L_CURLY@[7; 8) "{"
-        R_CURLY@[8; 9) "}"
-  WHITESPACE@[9; 10) "\n"
-  FN_DEF@[10; 31)
-    FN_KW@[10; 12) "fn"
-    WHITESPACE@[12; 13) " "
-    NAME@[13; 14)
-      IDENT@[13; 14) "b"
-    PARAM_LIST@[14; 16)
-      L_PAREN@[14; 15) "("
-      R_PAREN@[15; 16) ")"
-    WHITESPACE@[16; 17) " "
-    BLOCK_EXPR@[17; 31)
-      BLOCK@[17; 31)
-        L_CURLY@[17; 18) "{"
-        WHITESPACE@[18; 19) " "
-        LET_STMT@[19; 29)
-          LET_KW@[19; 22) "let"
-          WHITESPACE@[22; 23) " "
-          PLACEHOLDER_PAT@[23; 24)
-            UNDERSCORE@[23; 24) "_"
-          WHITESPACE@[24; 25) " "
-          EQ@[25; 26) "="
-          WHITESPACE@[26; 27) " "
-          LITERAL@[27; 28)
-            INT_NUMBER@[27; 28) "1"
-          SEMICOLON@[28; 29) ";"
-        WHITESPACE@[29; 30) " "
-        R_CURLY@[30; 31) "}"
-  WHITESPACE@[31; 32) "\n"
-  FN_DEF@[32; 48)
-    FN_KW@[32; 34) "fn"
-    WHITESPACE@[34; 35) " "
-    NAME@[35; 36)
-      IDENT@[35; 36) "c"
-    PARAM_LIST@[36; 38)
-      L_PAREN@[36; 37) "("
-      R_PAREN@[37; 38) ")"
-    WHITESPACE@[38; 39) " "
-    BLOCK_EXPR@[39; 48)
-      BLOCK@[39; 48)
-        L_CURLY@[39; 40) "{"
-        WHITESPACE@[40; 41) " "
-        EXPR_STMT@[41; 43)
-          LITERAL@[41; 42)
-            INT_NUMBER@[41; 42) "1"
-          SEMICOLON@[42; 43) ";"
-        WHITESPACE@[43; 44) " "
-        EXPR_STMT@[44; 46)
-          LITERAL@[44; 45)
-            INT_NUMBER@[44; 45) "2"
-          SEMICOLON@[45; 46) ";"
-        WHITESPACE@[46; 47) " "
-        R_CURLY@[47; 48) "}"
-  WHITESPACE@[48; 49) "\n"
-  FN_DEF@[49; 64)
-    FN_KW@[49; 51) "fn"
-    WHITESPACE@[51; 52) " "
-    NAME@[52; 53)
-      IDENT@[52; 53) "d"
-    PARAM_LIST@[53; 55)
-      L_PAREN@[53; 54) "("
-      R_PAREN@[54; 55) ")"
-    WHITESPACE@[55; 56) " "
-    BLOCK_EXPR@[56; 64)
-      BLOCK@[56; 64)
-        L_CURLY@[56; 57) "{"
-        WHITESPACE@[57; 58) " "
-        EXPR_STMT@[58; 60)
-          LITERAL@[58; 59)
-            INT_NUMBER@[58; 59) "1"
-          SEMICOLON@[59; 60) ";"
-        WHITESPACE@[60; 61) " "
-        LITERAL@[61; 62)
-          INT_NUMBER@[61; 62) "2"
-        WHITESPACE@[62; 63) " "
-        R_CURLY@[63; 64) "}"
-  WHITESPACE@[64; 65) "\n"
+SOURCE_FILE@0..65
+  FN_DEF@0..9
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..4
+      IDENT@3..4 "a"
+    PARAM_LIST@4..6
+      L_PAREN@4..5 "("
+      R_PAREN@5..6 ")"
+    WHITESPACE@6..7 " "
+    BLOCK_EXPR@7..9
+      BLOCK@7..9
+        L_CURLY@7..8 "{"
+        R_CURLY@8..9 "}"
+  WHITESPACE@9..10 "\n"
+  FN_DEF@10..31
+    FN_KW@10..12 "fn"
+    WHITESPACE@12..13 " "
+    NAME@13..14
+      IDENT@13..14 "b"
+    PARAM_LIST@14..16
+      L_PAREN@14..15 "("
+      R_PAREN@15..16 ")"
+    WHITESPACE@16..17 " "
+    BLOCK_EXPR@17..31
+      BLOCK@17..31
+        L_CURLY@17..18 "{"
+        WHITESPACE@18..19 " "
+        LET_STMT@19..29
+          LET_KW@19..22 "let"
+          WHITESPACE@22..23 " "
+          PLACEHOLDER_PAT@23..24
+            UNDERSCORE@23..24 "_"
+          WHITESPACE@24..25 " "
+          EQ@25..26 "="
+          WHITESPACE@26..27 " "
+          LITERAL@27..28
+            INT_NUMBER@27..28 "1"
+          SEMICOLON@28..29 ";"
+        WHITESPACE@29..30 " "
+        R_CURLY@30..31 "}"
+  WHITESPACE@31..32 "\n"
+  FN_DEF@32..48
+    FN_KW@32..34 "fn"
+    WHITESPACE@34..35 " "
+    NAME@35..36
+      IDENT@35..36 "c"
+    PARAM_LIST@36..38
+      L_PAREN@36..37 "("
+      R_PAREN@37..38 ")"
+    WHITESPACE@38..39 " "
+    BLOCK_EXPR@39..48
+      BLOCK@39..48
+        L_CURLY@39..40 "{"
+        WHITESPACE@40..41 " "
+        EXPR_STMT@41..43
+          LITERAL@41..42
+            INT_NUMBER@41..42 "1"
+          SEMICOLON@42..43 ";"
+        WHITESPACE@43..44 " "
+        EXPR_STMT@44..46
+          LITERAL@44..45
+            INT_NUMBER@44..45 "2"
+          SEMICOLON@45..46 ";"
+        WHITESPACE@46..47 " "
+        R_CURLY@47..48 "}"
+  WHITESPACE@48..49 "\n"
+  FN_DEF@49..64
+    FN_KW@49..51 "fn"
+    WHITESPACE@51..52 " "
+    NAME@52..53
+      IDENT@52..53 "d"
+    PARAM_LIST@53..55
+      L_PAREN@53..54 "("
+      R_PAREN@54..55 ")"
+    WHITESPACE@55..56 " "
+    BLOCK_EXPR@56..64
+      BLOCK@56..64
+        L_CURLY@56..57 "{"
+        WHITESPACE@57..58 " "
+        EXPR_STMT@58..60
+          LITERAL@58..59
+            INT_NUMBER@58..59 "1"
+          SEMICOLON@59..60 ";"
+        WHITESPACE@60..61 " "
+        LITERAL@61..62
+          INT_NUMBER@61..62 "2"
+        WHITESPACE@62..63 " "
+        R_CURLY@63..64 "}"
+  WHITESPACE@64..65 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
index 8e4b63f02..9621ba59e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
@@ -1,40 +1,40 @@
-SOURCE_FILE@[0; 29)
-  FN_DEF@[0; 28)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    TYPE_PARAM_LIST@[6; 9)
-      L_ANGLE@[6; 7) "<"
-      TYPE_PARAM@[7; 8)
-        NAME@[7; 8)
-          IDENT@[7; 8) "T"
-      R_ANGLE@[8; 9) ">"
-    PARAM_LIST@[9; 11)
-      L_PAREN@[9; 10) "("
-      R_PAREN@[10; 11) ")"
-    WHITESPACE@[11; 12) " "
-    WHERE_CLAUSE@[12; 25)
-      WHERE_KW@[12; 17) "where"
-      WHITESPACE@[17; 18) " "
-      WHERE_PRED@[18; 25)
-        PATH_TYPE@[18; 19)
-          PATH@[18; 19)
-            PATH_SEGMENT@[18; 19)
-              NAME_REF@[18; 19)
-                IDENT@[18; 19) "T"
-        COLON@[19; 20) ":"
-        WHITESPACE@[20; 21) " "
-        TYPE_BOUND_LIST@[21; 25)
-          TYPE_BOUND@[21; 25)
-            PATH_TYPE@[21; 25)
-              PATH@[21; 25)
-                PATH_SEGMENT@[21; 25)
-                  NAME_REF@[21; 25)
-                    IDENT@[21; 25) "Copy"
-    WHITESPACE@[25; 26) " "
-    BLOCK_EXPR@[26; 28)
-      BLOCK@[26; 28)
-        L_CURLY@[26; 27) "{"
-        R_CURLY@[27; 28) "}"
-  WHITESPACE@[28; 29) "\n"
+SOURCE_FILE@0..29
+  FN_DEF@0..28
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    TYPE_PARAM_LIST@6..9
+      L_ANGLE@6..7 "<"
+      TYPE_PARAM@7..8
+        NAME@7..8
+          IDENT@7..8 "T"
+      R_ANGLE@8..9 ">"
+    PARAM_LIST@9..11
+      L_PAREN@9..10 "("
+      R_PAREN@10..11 ")"
+    WHITESPACE@11..12 " "
+    WHERE_CLAUSE@12..25
+      WHERE_KW@12..17 "where"
+      WHITESPACE@17..18 " "
+      WHERE_PRED@18..25
+        PATH_TYPE@18..19
+          PATH@18..19
+            PATH_SEGMENT@18..19
+              NAME_REF@18..19
+                IDENT@18..19 "T"
+        COLON@19..20 ":"
+        WHITESPACE@20..21 " "
+        TYPE_BOUND_LIST@21..25
+          TYPE_BOUND@21..25
+            PATH_TYPE@21..25
+              PATH@21..25
+                PATH_SEGMENT@21..25
+                  NAME_REF@21..25
+                    IDENT@21..25 "Copy"
+    WHITESPACE@25..26 " "
+    BLOCK_EXPR@26..28
+      BLOCK@26..28
+        L_CURLY@26..27 "{"
+        R_CURLY@27..28 "}"
+  WHITESPACE@28..29 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
index bb9f674e1..ed9d62c5f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
@@ -1,26 +1,26 @@
-SOURCE_FILE@[0; 21)
-  FN_DEF@[0; 20)
-    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; 20)
-      BLOCK@[9; 20)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 18)
-          TRY_EXPR@[15; 17)
-            PATH_EXPR@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "x"
-            QUESTION@[16; 17) "?"
-          SEMICOLON@[17; 18) ";"
-        WHITESPACE@[18; 19) "\n"
-        R_CURLY@[19; 20) "}"
-  WHITESPACE@[20; 21) "\n"
+SOURCE_FILE@0..21
+  FN_DEF@0..20
+    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..20
+      BLOCK@9..20
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..18
+          TRY_EXPR@15..17
+            PATH_EXPR@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "x"
+            QUESTION@16..17 "?"
+          SEMICOLON@17..18 ";"
+        WHITESPACE@18..19 "\n"
+        R_CURLY@19..20 "}"
+  WHITESPACE@20..21 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
index 9a38192d9..a08e16fab 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
@@ -1,16 +1,16 @@
-SOURCE_FILE@[0; 16)
-  TYPE_ALIAS_DEF@[0; 15)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 8)
-      IDENT@[5; 8) "Foo"
-    WHITESPACE@[8; 9) " "
-    EQ@[9; 10) "="
-    WHITESPACE@[10; 11) " "
-    PATH_TYPE@[11; 14)
-      PATH@[11; 14)
-        PATH_SEGMENT@[11; 14)
-          NAME_REF@[11; 14)
-            IDENT@[11; 14) "Bar"
-    SEMICOLON@[14; 15) ";"
-  WHITESPACE@[15; 16) "\n"
+SOURCE_FILE@0..16
+  TYPE_ALIAS_DEF@0..15
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..8
+      IDENT@5..8 "Foo"
+    WHITESPACE@8..9 " "
+    EQ@9..10 "="
+    WHITESPACE@10..11 " "
+    PATH_TYPE@11..14
+      PATH@11..14
+        PATH_SEGMENT@11..14
+          NAME_REF@11..14
+            IDENT@11..14 "Bar"
+    SEMICOLON@14..15 ";"
+  WHITESPACE@15..16 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
index 4c2863ba7..a00ab40f9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
@@ -1,14 +1,14 @@
-SOURCE_FILE@[0; 12)
-  IMPL_DEF@[0; 11)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 8)
-      PATH@[5; 8)
-        PATH_SEGMENT@[5; 8)
-          NAME_REF@[5; 8)
-            IDENT@[5; 8) "Foo"
-    WHITESPACE@[8; 9) " "
-    ITEM_LIST@[9; 11)
-      L_CURLY@[9; 10) "{"
-      R_CURLY@[10; 11) "}"
-  WHITESPACE@[11; 12) "\n"
+SOURCE_FILE@0..12
+  IMPL_DEF@0..11
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..8
+      PATH@5..8
+        PATH_SEGMENT@5..8
+          NAME_REF@5..8
+            IDENT@5..8 "Foo"
+    WHITESPACE@8..9 " "
+    ITEM_LIST@9..11
+      L_CURLY@9..10 "{"
+      R_CURLY@10..11 "}"
+  WHITESPACE@11..12 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index b8bafc220..5141ce70d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
@@ -1,96 +1,96 @@
-SOURCE_FILE@[0; 89)
-  FN_DEF@[0; 88)
-    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; 88)
-      BLOCK@[9; 88)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 27)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          BIND_PAT@[19; 20)
-            NAME@[19; 20)
-              IDENT@[19; 20) "x"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          RANGE_EXPR@[23; 26)
-            LITERAL@[23; 24)
-              INT_NUMBER@[23; 24) "1"
-            DOT2@[24; 26) ".."
-          SEMICOLON@[26; 27) ";"
-        WHITESPACE@[27; 32) "\n    "
-        EXPR_STMT@[32; 54)
-          MATCH_EXPR@[32; 53)
-            MATCH_KW@[32; 37) "match"
-            WHITESPACE@[37; 38) " "
-            RANGE_EXPR@[38; 41)
-              LITERAL@[38; 39)
-                INT_NUMBER@[38; 39) "1"
-              DOT2@[39; 41) ".."
-            WHITESPACE@[41; 42) " "
-            MATCH_ARM_LIST@[42; 53)
-              L_CURLY@[42; 43) "{"
-              WHITESPACE@[43; 44) " "
-              MATCH_ARM@[44; 51)
-                PLACEHOLDER_PAT@[44; 45)
-                  UNDERSCORE@[44; 45) "_"
-                WHITESPACE@[45; 46) " "
-                FAT_ARROW@[46; 48) "=>"
-                WHITESPACE@[48; 49) " "
-                TUPLE_EXPR@[49; 51)
-                  L_PAREN@[49; 50) "("
-                  R_PAREN@[50; 51) ")"
-              WHITESPACE@[51; 52) " "
-              R_CURLY@[52; 53) "}"
-          SEMICOLON@[53; 54) ";"
-        WHITESPACE@[54; 59) "\n    "
-        EXPR_STMT@[59; 86)
-          MATCH_EXPR@[59; 85)
-            MATCH_KW@[59; 64) "match"
-            WHITESPACE@[64; 65) " "
-            RANGE_EXPR@[65; 73)
-              METHOD_CALL_EXPR@[65; 70)
-                PATH_EXPR@[65; 66)
-                  PATH@[65; 66)
-                    PATH_SEGMENT@[65; 66)
-                      NAME_REF@[65; 66)
-                        IDENT@[65; 66) "a"
-                DOT@[66; 67) "."
-                NAME_REF@[67; 68)
-                  IDENT@[67; 68) "b"
-                ARG_LIST@[68; 70)
-                  L_PAREN@[68; 69) "("
-                  R_PAREN@[69; 70) ")"
-              DOT2@[70; 72) ".."
-              PATH_EXPR@[72; 73)
-                PATH@[72; 73)
-                  PATH_SEGMENT@[72; 73)
-                    NAME_REF@[72; 73)
-                      IDENT@[72; 73) "S"
-            WHITESPACE@[73; 74) " "
-            MATCH_ARM_LIST@[74; 85)
-              L_CURLY@[74; 75) "{"
-              WHITESPACE@[75; 76) " "
-              MATCH_ARM@[76; 83)
-                PLACEHOLDER_PAT@[76; 77)
-                  UNDERSCORE@[76; 77) "_"
-                WHITESPACE@[77; 78) " "
-                FAT_ARROW@[78; 80) "=>"
-                WHITESPACE@[80; 81) " "
-                TUPLE_EXPR@[81; 83)
-                  L_PAREN@[81; 82) "("
-                  R_PAREN@[82; 83) ")"
-              WHITESPACE@[83; 84) " "
-              R_CURLY@[84; 85) "}"
-          SEMICOLON@[85; 86) ";"
-        WHITESPACE@[86; 87) "\n"
-        R_CURLY@[87; 88) "}"
-  WHITESPACE@[88; 89) "\n"
+SOURCE_FILE@0..89
+  FN_DEF@0..88
+    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..88
+      BLOCK@9..88
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..27
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          BIND_PAT@19..20
+            NAME@19..20
+              IDENT@19..20 "x"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          RANGE_EXPR@23..26
+            LITERAL@23..24
+              INT_NUMBER@23..24 "1"
+            DOT2@24..26 ".."
+          SEMICOLON@26..27 ";"
+        WHITESPACE@27..32 "\n    "
+        EXPR_STMT@32..54
+          MATCH_EXPR@32..53
+            MATCH_KW@32..37 "match"
+            WHITESPACE@37..38 " "
+            RANGE_EXPR@38..41
+              LITERAL@38..39
+                INT_NUMBER@38..39 "1"
+              DOT2@39..41 ".."
+            WHITESPACE@41..42 " "
+            MATCH_ARM_LIST@42..53
+              L_CURLY@42..43 "{"
+              WHITESPACE@43..44 " "
+              MATCH_ARM@44..51
+                PLACEHOLDER_PAT@44..45
+                  UNDERSCORE@44..45 "_"
+                WHITESPACE@45..46 " "
+                FAT_ARROW@46..48 "=>"
+                WHITESPACE@48..49 " "
+                TUPLE_EXPR@49..51
+                  L_PAREN@49..50 "("
+                  R_PAREN@50..51 ")"
+              WHITESPACE@51..52 " "
+              R_CURLY@52..53 "}"
+          SEMICOLON@53..54 ";"
+        WHITESPACE@54..59 "\n    "
+        EXPR_STMT@59..86
+          MATCH_EXPR@59..85
+            MATCH_KW@59..64 "match"
+            WHITESPACE@64..65 " "
+            RANGE_EXPR@65..73
+              METHOD_CALL_EXPR@65..70
+                PATH_EXPR@65..66
+                  PATH@65..66
+                    PATH_SEGMENT@65..66
+                      NAME_REF@65..66
+                        IDENT@65..66 "a"
+                DOT@66..67 "."
+                NAME_REF@67..68
+                  IDENT@67..68 "b"
+                ARG_LIST@68..70
+                  L_PAREN@68..69 "("
+                  R_PAREN@69..70 ")"
+              DOT2@70..72 ".."
+              PATH_EXPR@72..73
+                PATH@72..73
+                  PATH_SEGMENT@72..73
+                    NAME_REF@72..73
+                      IDENT@72..73 "S"
+            WHITESPACE@73..74 " "
+            MATCH_ARM_LIST@74..85
+              L_CURLY@74..75 "{"
+              WHITESPACE@75..76 " "
+              MATCH_ARM@76..83
+                PLACEHOLDER_PAT@76..77
+                  UNDERSCORE@76..77 "_"
+                WHITESPACE@77..78 " "
+                FAT_ARROW@78..80 "=>"
+                WHITESPACE@80..81 " "
+                TUPLE_EXPR@81..83
+                  L_PAREN@81..82 "("
+                  R_PAREN@82..83 ")"
+              WHITESPACE@83..84 " "
+              R_CURLY@84..85 "}"
+          SEMICOLON@85..86 ";"
+        WHITESPACE@86..87 "\n"
+        R_CURLY@87..88 "}"
+  WHITESPACE@88..89 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index 00c4e4220..cdbe64180 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -1,243 +1,243 @@
-SOURCE_FILE@[0; 200)
-  TYPE_ALIAS_DEF@[0; 28)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    FOR_TYPE@[9; 27)
-      FOR_KW@[9; 12) "for"
-      TYPE_PARAM_LIST@[12; 16)
-        L_ANGLE@[12; 13) "<"
-        LIFETIME_PARAM@[13; 15)
-          LIFETIME@[13; 15) "\'a"
-        R_ANGLE@[15; 16) ">"
-      WHITESPACE@[16; 17) " "
-      FN_POINTER_TYPE@[17; 27)
-        FN_KW@[17; 19) "fn"
-        PARAM_LIST@[19; 21)
-          L_PAREN@[19; 20) "("
-          R_PAREN@[20; 21) ")"
-        WHITESPACE@[21; 22) " "
-        RET_TYPE@[22; 27)
-          THIN_ARROW@[22; 24) "->"
-          WHITESPACE@[24; 25) " "
-          TUPLE_TYPE@[25; 27)
-            L_PAREN@[25; 26) "("
-            R_PAREN@[26; 27) ")"
-    SEMICOLON@[27; 28) ";"
-  WHITESPACE@[28; 29) "\n"
-  FN_DEF@[29; 79)
-    FN_KW@[29; 31) "fn"
-    WHITESPACE@[31; 32) " "
-    NAME@[32; 35)
-      IDENT@[32; 35) "foo"
-    TYPE_PARAM_LIST@[35; 38)
-      L_ANGLE@[35; 36) "<"
-      TYPE_PARAM@[36; 37)
-        NAME@[36; 37)
-          IDENT@[36; 37) "T"
-      R_ANGLE@[37; 38) ">"
-    PARAM_LIST@[38; 46)
-      L_PAREN@[38; 39) "("
-      PARAM@[39; 45)
-        BIND_PAT@[39; 41)
-          NAME@[39; 41)
-            IDENT@[39; 41) "_t"
-        COLON@[41; 42) ":"
-        WHITESPACE@[42; 43) " "
-        REFERENCE_TYPE@[43; 45)
-          AMP@[43; 44) "&"
-          PATH_TYPE@[44; 45)
-            PATH@[44; 45)
-              PATH_SEGMENT@[44; 45)
-                NAME_REF@[44; 45)
-                  IDENT@[44; 45) "T"
-      R_PAREN@[45; 46) ")"
-    WHITESPACE@[46; 47) " "
-    WHERE_CLAUSE@[47; 76)
-      WHERE_KW@[47; 52) "where"
-      WHITESPACE@[52; 53) " "
-      WHERE_PRED@[53; 76)
-        FOR_TYPE@[53; 66)
-          FOR_KW@[53; 56) "for"
-          TYPE_PARAM_LIST@[56; 60)
-            L_ANGLE@[56; 57) "<"
-            LIFETIME_PARAM@[57; 59)
-              LIFETIME@[57; 59) "\'a"
-            R_ANGLE@[59; 60) ">"
-          WHITESPACE@[60; 61) " "
-          REFERENCE_TYPE@[61; 66)
-            AMP@[61; 62) "&"
-            LIFETIME@[62; 64) "\'a"
-            WHITESPACE@[64; 65) " "
-            PATH_TYPE@[65; 66)
-              PATH@[65; 66)
-                PATH_SEGMENT@[65; 66)
-                  NAME_REF@[65; 66)
-                    IDENT@[65; 66) "T"
-        COLON@[66; 67) ":"
-        WHITESPACE@[67; 68) " "
-        TYPE_BOUND_LIST@[68; 76)
-          TYPE_BOUND@[68; 76)
-            PATH_TYPE@[68; 76)
-              PATH@[68; 76)
-                PATH_SEGMENT@[68; 76)
-                  NAME_REF@[68; 76)
-                    IDENT@[68; 76) "Iterator"
-    WHITESPACE@[76; 77) " "
-    BLOCK_EXPR@[77; 79)
-      BLOCK@[77; 79)
-        L_CURLY@[77; 78) "{"
-        R_CURLY@[78; 79) "}"
-  WHITESPACE@[79; 80) "\n"
-  FN_DEF@[80; 134)
-    FN_KW@[80; 82) "fn"
-    WHITESPACE@[82; 83) " "
-    NAME@[83; 86)
-      IDENT@[83; 86) "bar"
-    TYPE_PARAM_LIST@[86; 89)
-      L_ANGLE@[86; 87) "<"
-      TYPE_PARAM@[87; 88)
-        NAME@[87; 88)
-          IDENT@[87; 88) "T"
-      R_ANGLE@[88; 89) ">"
-    PARAM_LIST@[89; 97)
-      L_PAREN@[89; 90) "("
-      PARAM@[90; 96)
-        BIND_PAT@[90; 92)
-          NAME@[90; 92)
-            IDENT@[90; 92) "_t"
-        COLON@[92; 93) ":"
-        WHITESPACE@[93; 94) " "
-        REFERENCE_TYPE@[94; 96)
-          AMP@[94; 95) "&"
-          PATH_TYPE@[95; 96)
-            PATH@[95; 96)
-              PATH_SEGMENT@[95; 96)
-                NAME_REF@[95; 96)
-                  IDENT@[95; 96) "T"
-      R_PAREN@[96; 97) ")"
-    WHITESPACE@[97; 98) " "
-    WHERE_CLAUSE@[98; 131)
-      WHERE_KW@[98; 103) "where"
-      WHITESPACE@[103; 104) " "
-      WHERE_PRED@[104; 131)
-        FOR_TYPE@[104; 121)
-          FOR_KW@[104; 107) "for"
-          TYPE_PARAM_LIST@[107; 111)
-            L_ANGLE@[107; 108) "<"
-            LIFETIME_PARAM@[108; 110)
-              LIFETIME@[108; 110) "\'a"
-            R_ANGLE@[110; 111) ">"
-          WHITESPACE@[111; 112) " "
-          REFERENCE_TYPE@[112; 121)
-            AMP@[112; 113) "&"
-            LIFETIME@[113; 115) "\'a"
-            WHITESPACE@[115; 116) " "
-            MUT_KW@[116; 119) "mut"
-            WHITESPACE@[119; 120) " "
-            PATH_TYPE@[120; 121)
-              PATH@[120; 121)
-                PATH_SEGMENT@[120; 121)
-                  NAME_REF@[120; 121)
-                    IDENT@[120; 121) "T"
-        COLON@[121; 122) ":"
-        WHITESPACE@[122; 123) " "
-        TYPE_BOUND_LIST@[123; 131)
-          TYPE_BOUND@[123; 131)
-            PATH_TYPE@[123; 131)
-              PATH@[123; 131)
-                PATH_SEGMENT@[123; 131)
-                  NAME_REF@[123; 131)
-                    IDENT@[123; 131) "Iterator"
-    WHITESPACE@[131; 132) " "
-    BLOCK_EXPR@[132; 134)
-      BLOCK@[132; 134)
-        L_CURLY@[132; 133) "{"
-        R_CURLY@[133; 134) "}"
-  WHITESPACE@[134; 135) "\n"
-  FN_DEF@[135; 199)
-    FN_KW@[135; 137) "fn"
-    WHITESPACE@[137; 138) " "
-    NAME@[138; 141)
-      IDENT@[138; 141) "baz"
-    TYPE_PARAM_LIST@[141; 144)
-      L_ANGLE@[141; 142) "<"
-      TYPE_PARAM@[142; 143)
-        NAME@[142; 143)
-          IDENT@[142; 143) "T"
-      R_ANGLE@[143; 144) ">"
-    PARAM_LIST@[144; 152)
-      L_PAREN@[144; 145) "("
-      PARAM@[145; 151)
-        BIND_PAT@[145; 147)
-          NAME@[145; 147)
-            IDENT@[145; 147) "_t"
-        COLON@[147; 148) ":"
-        WHITESPACE@[148; 149) " "
-        REFERENCE_TYPE@[149; 151)
-          AMP@[149; 150) "&"
-          PATH_TYPE@[150; 151)
-            PATH@[150; 151)
-              PATH_SEGMENT@[150; 151)
-                NAME_REF@[150; 151)
-                  IDENT@[150; 151) "T"
-      R_PAREN@[151; 152) ")"
-    WHITESPACE@[152; 153) " "
-    WHERE_CLAUSE@[153; 196)
-      WHERE_KW@[153; 158) "where"
-      WHITESPACE@[158; 159) " "
-      WHERE_PRED@[159; 196)
-        FOR_TYPE@[159; 186)
-          FOR_KW@[159; 162) "for"
-          TYPE_PARAM_LIST@[162; 166)
-            L_ANGLE@[162; 163) "<"
-            LIFETIME_PARAM@[163; 165)
-              LIFETIME@[163; 165) "\'a"
-            R_ANGLE@[165; 166) ">"
-          WHITESPACE@[166; 167) " "
-          PATH_TYPE@[167; 186)
-            PATH@[167; 186)
-              PATH@[167; 181)
-                PATH_SEGMENT@[167; 181)
-                  L_ANGLE@[167; 168) "<"
-                  REFERENCE_TYPE@[168; 173)
-                    AMP@[168; 169) "&"
-                    LIFETIME@[169; 171) "\'a"
-                    WHITESPACE@[171; 172) " "
-                    PATH_TYPE@[172; 173)
-                      PATH@[172; 173)
-                        PATH_SEGMENT@[172; 173)
-                          NAME_REF@[172; 173)
-                            IDENT@[172; 173) "T"
-                  WHITESPACE@[173; 174) " "
-                  AS_KW@[174; 176) "as"
-                  WHITESPACE@[176; 177) " "
-                  PATH_TYPE@[177; 180)
-                    PATH@[177; 180)
-                      PATH_SEGMENT@[177; 180)
-                        NAME_REF@[177; 180)
-                          IDENT@[177; 180) "Baz"
-                  R_ANGLE@[180; 181) ">"
-              COLON2@[181; 183) "::"
-              PATH_SEGMENT@[183; 186)
-                NAME_REF@[183; 186)
-                  IDENT@[183; 186) "Foo"
-        COLON@[186; 187) ":"
-        WHITESPACE@[187; 188) " "
-        TYPE_BOUND_LIST@[188; 196)
-          TYPE_BOUND@[188; 196)
-            PATH_TYPE@[188; 196)
-              PATH@[188; 196)
-                PATH_SEGMENT@[188; 196)
-                  NAME_REF@[188; 196)
-                    IDENT@[188; 196) "Iterator"
-    WHITESPACE@[196; 197) " "
-    BLOCK_EXPR@[197; 199)
-      BLOCK@[197; 199)
-        L_CURLY@[197; 198) "{"
-        R_CURLY@[198; 199) "}"
-  WHITESPACE@[199; 200) "\n"
+SOURCE_FILE@0..200
+  TYPE_ALIAS_DEF@0..28
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    FOR_TYPE@9..27
+      FOR_KW@9..12 "for"
+      TYPE_PARAM_LIST@12..16
+        L_ANGLE@12..13 "<"
+        LIFETIME_PARAM@13..15
+          LIFETIME@13..15 "\'a"
+        R_ANGLE@15..16 ">"
+      WHITESPACE@16..17 " "
+      FN_POINTER_TYPE@17..27
+        FN_KW@17..19 "fn"
+        PARAM_LIST@19..21
+          L_PAREN@19..20 "("
+          R_PAREN@20..21 ")"
+        WHITESPACE@21..22 " "
+        RET_TYPE@22..27
+          THIN_ARROW@22..24 "->"
+          WHITESPACE@24..25 " "
+          TUPLE_TYPE@25..27
+            L_PAREN@25..26 "("
+            R_PAREN@26..27 ")"
+    SEMICOLON@27..28 ";"
+  WHITESPACE@28..29 "\n"
+  FN_DEF@29..79
+    FN_KW@29..31 "fn"
+    WHITESPACE@31..32 " "
+    NAME@32..35
+      IDENT@32..35 "foo"
+    TYPE_PARAM_LIST@35..38
+      L_ANGLE@35..36 "<"
+      TYPE_PARAM@36..37
+        NAME@36..37
+          IDENT@36..37 "T"
+      R_ANGLE@37..38 ">"
+    PARAM_LIST@38..46
+      L_PAREN@38..39 "("
+      PARAM@39..45
+        BIND_PAT@39..41
+          NAME@39..41
+            IDENT@39..41 "_t"
+        COLON@41..42 ":"
+        WHITESPACE@42..43 " "
+        REFERENCE_TYPE@43..45
+          AMP@43..44 "&"
+          PATH_TYPE@44..45
+            PATH@44..45
+              PATH_SEGMENT@44..45
+                NAME_REF@44..45
+                  IDENT@44..45 "T"
+      R_PAREN@45..46 ")"
+    WHITESPACE@46..47 " "
+    WHERE_CLAUSE@47..76
+      WHERE_KW@47..52 "where"
+      WHITESPACE@52..53 " "
+      WHERE_PRED@53..76
+        FOR_TYPE@53..66
+          FOR_KW@53..56 "for"
+          TYPE_PARAM_LIST@56..60
+            L_ANGLE@56..57 "<"
+            LIFETIME_PARAM@57..59
+              LIFETIME@57..59 "\'a"
+            R_ANGLE@59..60 ">"
+          WHITESPACE@60..61 " "
+          REFERENCE_TYPE@61..66
+            AMP@61..62 "&"
+            LIFETIME@62..64 "\'a"
+            WHITESPACE@64..65 " "
+            PATH_TYPE@65..66
+              PATH@65..66
+                PATH_SEGMENT@65..66
+                  NAME_REF@65..66
+                    IDENT@65..66 "T"
+        COLON@66..67 ":"
+        WHITESPACE@67..68 " "
+        TYPE_BOUND_LIST@68..76
+          TYPE_BOUND@68..76
+            PATH_TYPE@68..76
+              PATH@68..76
+                PATH_SEGMENT@68..76
+                  NAME_REF@68..76
+                    IDENT@68..76 "Iterator"
+    WHITESPACE@76..77 " "
+    BLOCK_EXPR@77..79
+      BLOCK@77..79
+        L_CURLY@77..78 "{"
+        R_CURLY@78..79 "}"
+  WHITESPACE@79..80 "\n"
+  FN_DEF@80..134
+    FN_KW@80..82 "fn"
+    WHITESPACE@82..83 " "
+    NAME@83..86
+      IDENT@83..86 "bar"
+    TYPE_PARAM_LIST@86..89
+      L_ANGLE@86..87 "<"
+      TYPE_PARAM@87..88
+        NAME@87..88
+          IDENT@87..88 "T"
+      R_ANGLE@88..89 ">"
+    PARAM_LIST@89..97
+      L_PAREN@89..90 "("
+      PARAM@90..96
+        BIND_PAT@90..92
+          NAME@90..92
+            IDENT@90..92 "_t"
+        COLON@92..93 ":"
+        WHITESPACE@93..94 " "
+        REFERENCE_TYPE@94..96
+          AMP@94..95 "&"
+          PATH_TYPE@95..96
+            PATH@95..96
+              PATH_SEGMENT@95..96
+                NAME_REF@95..96
+                  IDENT@95..96 "T"
+      R_PAREN@96..97 ")"
+    WHITESPACE@97..98 " "
+    WHERE_CLAUSE@98..131
+      WHERE_KW@98..103 "where"
+      WHITESPACE@103..104 " "
+      WHERE_PRED@104..131
+        FOR_TYPE@104..121
+          FOR_KW@104..107 "for"
+          TYPE_PARAM_LIST@107..111
+            L_ANGLE@107..108 "<"
+            LIFETIME_PARAM@108..110
+              LIFETIME@108..110 "\'a"
+            R_ANGLE@110..111 ">"
+          WHITESPACE@111..112 " "
+          REFERENCE_TYPE@112..121
+            AMP@112..113 "&"
+            LIFETIME@113..115 "\'a"
+            WHITESPACE@115..116 " "
+            MUT_KW@116..119 "mut"
+            WHITESPACE@119..120 " "
+            PATH_TYPE@120..121
+              PATH@120..121
+                PATH_SEGMENT@120..121
+                  NAME_REF@120..121
+                    IDENT@120..121 "T"
+        COLON@121..122 ":"
+        WHITESPACE@122..123 " "
+        TYPE_BOUND_LIST@123..131
+          TYPE_BOUND@123..131
+            PATH_TYPE@123..131
+              PATH@123..131
+                PATH_SEGMENT@123..131
+                  NAME_REF@123..131
+                    IDENT@123..131 "Iterator"
+    WHITESPACE@131..132 " "
+    BLOCK_EXPR@132..134
+      BLOCK@132..134
+        L_CURLY@132..133 "{"
+        R_CURLY@133..134 "}"
+  WHITESPACE@134..135 "\n"
+  FN_DEF@135..199
+    FN_KW@135..137 "fn"
+    WHITESPACE@137..138 " "
+    NAME@138..141
+      IDENT@138..141 "baz"
+    TYPE_PARAM_LIST@141..144
+      L_ANGLE@141..142 "<"
+      TYPE_PARAM@142..143
+        NAME@142..143
+          IDENT@142..143 "T"
+      R_ANGLE@143..144 ">"
+    PARAM_LIST@144..152
+      L_PAREN@144..145 "("
+      PARAM@145..151
+        BIND_PAT@145..147
+          NAME@145..147
+            IDENT@145..147 "_t"
+        COLON@147..148 ":"
+        WHITESPACE@148..149 " "
+        REFERENCE_TYPE@149..151
+          AMP@149..150 "&"
+          PATH_TYPE@150..151
+            PATH@150..151
+              PATH_SEGMENT@150..151
+                NAME_REF@150..151
+                  IDENT@150..151 "T"
+      R_PAREN@151..152 ")"
+    WHITESPACE@152..153 " "
+    WHERE_CLAUSE@153..196
+      WHERE_KW@153..158 "where"
+      WHITESPACE@158..159 " "
+      WHERE_PRED@159..196
+        FOR_TYPE@159..186
+          FOR_KW@159..162 "for"
+          TYPE_PARAM_LIST@162..166
+            L_ANGLE@162..163 "<"
+            LIFETIME_PARAM@163..165
+              LIFETIME@163..165 "\'a"
+            R_ANGLE@165..166 ">"
+          WHITESPACE@166..167 " "
+          PATH_TYPE@167..186
+            PATH@167..186
+              PATH@167..181
+                PATH_SEGMENT@167..181
+                  L_ANGLE@167..168 "<"
+                  REFERENCE_TYPE@168..173
+                    AMP@168..169 "&"
+                    LIFETIME@169..171 "\'a"
+                    WHITESPACE@171..172 " "
+                    PATH_TYPE@172..173
+                      PATH@172..173
+                        PATH_SEGMENT@172..173
+                          NAME_REF@172..173
+                            IDENT@172..173 "T"
+                  WHITESPACE@173..174 " "
+                  AS_KW@174..176 "as"
+                  WHITESPACE@176..177 " "
+                  PATH_TYPE@177..180
+                    PATH@177..180
+                      PATH_SEGMENT@177..180
+                        NAME_REF@177..180
+                          IDENT@177..180 "Baz"
+                  R_ANGLE@180..181 ">"
+              COLON2@181..183 "::"
+              PATH_SEGMENT@183..186
+                NAME_REF@183..186
+                  IDENT@183..186 "Foo"
+        COLON@186..187 ":"
+        WHITESPACE@187..188 " "
+        TYPE_BOUND_LIST@188..196
+          TYPE_BOUND@188..196
+            PATH_TYPE@188..196
+              PATH@188..196
+                PATH_SEGMENT@188..196
+                  NAME_REF@188..196
+                    IDENT@188..196 "Iterator"
+    WHITESPACE@196..197 " "
+    BLOCK_EXPR@197..199
+      BLOCK@197..199
+        L_CURLY@197..198 "{"
+        R_CURLY@198..199 "}"
+  WHITESPACE@199..200 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index 2999977fc..fbad33389 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
@@ -1,55 +1,55 @@
-SOURCE_FILE@[0; 52)
-  FN_DEF@[0; 51)
-    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; 51)
-      BLOCK@[9; 51)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 26)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          REF_EXPR@[23; 25)
-            AMP@[23; 24) "&"
-            LITERAL@[24; 25)
-              INT_NUMBER@[24; 25) "1"
-          SEMICOLON@[25; 26) ";"
-        WHITESPACE@[26; 31) "\n    "
-        LET_STMT@[31; 49)
-          LET_KW@[31; 34) "let"
-          WHITESPACE@[34; 35) " "
-          PLACEHOLDER_PAT@[35; 36)
-            UNDERSCORE@[35; 36) "_"
-          WHITESPACE@[36; 37) " "
-          EQ@[37; 38) "="
-          WHITESPACE@[38; 39) " "
-          REF_EXPR@[39; 48)
-            AMP@[39; 40) "&"
-            MUT_KW@[40; 43) "mut"
-            WHITESPACE@[43; 44) " "
-            REF_EXPR@[44; 48)
-              AMP@[44; 45) "&"
-              CALL_EXPR@[45; 48)
-                PATH_EXPR@[45; 46)
-                  PATH@[45; 46)
-                    PATH_SEGMENT@[45; 46)
-                      NAME_REF@[45; 46)
-                        IDENT@[45; 46) "f"
-                ARG_LIST@[46; 48)
-                  L_PAREN@[46; 47) "("
-                  R_PAREN@[47; 48) ")"
-          SEMICOLON@[48; 49) ";"
-        WHITESPACE@[49; 50) "\n"
-        R_CURLY@[50; 51) "}"
-  WHITESPACE@[51; 52) "\n"
+SOURCE_FILE@0..52
+  FN_DEF@0..51
+    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..51
+      BLOCK@9..51
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..26
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          REF_EXPR@23..25
+            AMP@23..24 "&"
+            LITERAL@24..25
+              INT_NUMBER@24..25 "1"
+          SEMICOLON@25..26 ";"
+        WHITESPACE@26..31 "\n    "
+        LET_STMT@31..49
+          LET_KW@31..34 "let"
+          WHITESPACE@34..35 " "
+          PLACEHOLDER_PAT@35..36
+            UNDERSCORE@35..36 "_"
+          WHITESPACE@36..37 " "
+          EQ@37..38 "="
+          WHITESPACE@38..39 " "
+          REF_EXPR@39..48
+            AMP@39..40 "&"
+            MUT_KW@40..43 "mut"
+            WHITESPACE@43..44 " "
+            REF_EXPR@44..48
+              AMP@44..45 "&"
+              CALL_EXPR@45..48
+                PATH_EXPR@45..46
+                  PATH@45..46
+                    PATH_SEGMENT@45..46
+                      NAME_REF@45..46
+                        IDENT@45..46 "f"
+                ARG_LIST@46..48
+                  L_PAREN@46..47 "("
+                  R_PAREN@47..48 ")"
+          SEMICOLON@48..49 ";"
+        WHITESPACE@49..50 "\n"
+        R_CURLY@50..51 "}"
+  WHITESPACE@51..52 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
index 13393e4b8..217b07e59 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
@@ -1,87 +1,87 @@
-SOURCE_FILE@[0; 106)
-  STRUCT_DEF@[0; 11)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 10)
-      IDENT@[7; 10) "Foo"
-    SEMICOLON@[10; 11) ";"
-  WHITESPACE@[11; 12) "\n"
-  STRUCT_DEF@[12; 25)
-    STRUCT_KW@[12; 18) "struct"
-    WHITESPACE@[18; 19) " "
-    NAME@[19; 22)
-      IDENT@[19; 22) "Foo"
-    WHITESPACE@[22; 23) " "
-    RECORD_FIELD_DEF_LIST@[23; 25)
-      L_CURLY@[23; 24) "{"
-      R_CURLY@[24; 25) "}"
-  WHITESPACE@[25; 26) "\n"
-  STRUCT_DEF@[26; 39)
-    STRUCT_KW@[26; 32) "struct"
-    WHITESPACE@[32; 33) " "
-    NAME@[33; 36)
-      IDENT@[33; 36) "Foo"
-    TUPLE_FIELD_DEF_LIST@[36; 38)
-      L_PAREN@[36; 37) "("
-      R_PAREN@[37; 38) ")"
-    SEMICOLON@[38; 39) ";"
-  WHITESPACE@[39; 40) "\n"
-  STRUCT_DEF@[40; 66)
-    STRUCT_KW@[40; 46) "struct"
-    WHITESPACE@[46; 47) " "
-    NAME@[47; 50)
-      IDENT@[47; 50) "Foo"
-    TUPLE_FIELD_DEF_LIST@[50; 65)
-      L_PAREN@[50; 51) "("
-      TUPLE_FIELD_DEF@[51; 57)
-        PATH_TYPE@[51; 57)
-          PATH@[51; 57)
-            PATH_SEGMENT@[51; 57)
-              NAME_REF@[51; 57)
-                IDENT@[51; 57) "String"
-      COMMA@[57; 58) ","
-      WHITESPACE@[58; 59) " "
-      TUPLE_FIELD_DEF@[59; 64)
-        PATH_TYPE@[59; 64)
-          PATH@[59; 64)
-            PATH_SEGMENT@[59; 64)
-              NAME_REF@[59; 64)
-                IDENT@[59; 64) "usize"
-      R_PAREN@[64; 65) ")"
-    SEMICOLON@[65; 66) ";"
-  WHITESPACE@[66; 67) "\n"
-  STRUCT_DEF@[67; 105)
-    STRUCT_KW@[67; 73) "struct"
-    WHITESPACE@[73; 74) " "
-    NAME@[74; 77)
-      IDENT@[74; 77) "Foo"
-    WHITESPACE@[77; 78) " "
-    RECORD_FIELD_DEF_LIST@[78; 105)
-      L_CURLY@[78; 79) "{"
-      WHITESPACE@[79; 84) "\n    "
-      RECORD_FIELD_DEF@[84; 90)
-        NAME@[84; 85)
-          IDENT@[84; 85) "a"
-        COLON@[85; 86) ":"
-        WHITESPACE@[86; 87) " "
-        PATH_TYPE@[87; 90)
-          PATH@[87; 90)
-            PATH_SEGMENT@[87; 90)
-              NAME_REF@[87; 90)
-                IDENT@[87; 90) "i32"
-      COMMA@[90; 91) ","
-      WHITESPACE@[91; 96) "\n    "
-      RECORD_FIELD_DEF@[96; 102)
-        NAME@[96; 97)
-          IDENT@[96; 97) "b"
-        COLON@[97; 98) ":"
-        WHITESPACE@[98; 99) " "
-        PATH_TYPE@[99; 102)
-          PATH@[99; 102)
-            PATH_SEGMENT@[99; 102)
-              NAME_REF@[99; 102)
-                IDENT@[99; 102) "f32"
-      COMMA@[102; 103) ","
-      WHITESPACE@[103; 104) "\n"
-      R_CURLY@[104; 105) "}"
-  WHITESPACE@[105; 106) "\n"
+SOURCE_FILE@0..106
+  STRUCT_DEF@0..11
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..10
+      IDENT@7..10 "Foo"
+    SEMICOLON@10..11 ";"
+  WHITESPACE@11..12 "\n"
+  STRUCT_DEF@12..25
+    STRUCT_KW@12..18 "struct"
+    WHITESPACE@18..19 " "
+    NAME@19..22
+      IDENT@19..22 "Foo"
+    WHITESPACE@22..23 " "
+    RECORD_FIELD_DEF_LIST@23..25
+      L_CURLY@23..24 "{"
+      R_CURLY@24..25 "}"
+  WHITESPACE@25..26 "\n"
+  STRUCT_DEF@26..39
+    STRUCT_KW@26..32 "struct"
+    WHITESPACE@32..33 " "
+    NAME@33..36
+      IDENT@33..36 "Foo"
+    TUPLE_FIELD_DEF_LIST@36..38
+      L_PAREN@36..37 "("
+      R_PAREN@37..38 ")"
+    SEMICOLON@38..39 ";"
+  WHITESPACE@39..40 "\n"
+  STRUCT_DEF@40..66
+    STRUCT_KW@40..46 "struct"
+    WHITESPACE@46..47 " "
+    NAME@47..50
+      IDENT@47..50 "Foo"
+    TUPLE_FIELD_DEF_LIST@50..65
+      L_PAREN@50..51 "("
+      TUPLE_FIELD_DEF@51..57
+        PATH_TYPE@51..57
+          PATH@51..57
+            PATH_SEGMENT@51..57
+              NAME_REF@51..57
+                IDENT@51..57 "String"
+      COMMA@57..58 ","
+      WHITESPACE@58..59 " "
+      TUPLE_FIELD_DEF@59..64
+        PATH_TYPE@59..64
+          PATH@59..64
+            PATH_SEGMENT@59..64
+              NAME_REF@59..64
+                IDENT@59..64 "usize"
+      R_PAREN@64..65 ")"
+    SEMICOLON@65..66 ";"
+  WHITESPACE@66..67 "\n"
+  STRUCT_DEF@67..105
+    STRUCT_KW@67..73 "struct"
+    WHITESPACE@73..74 " "
+    NAME@74..77
+      IDENT@74..77 "Foo"
+    WHITESPACE@77..78 " "
+    RECORD_FIELD_DEF_LIST@78..105
+      L_CURLY@78..79 "{"
+      WHITESPACE@79..84 "\n    "
+      RECORD_FIELD_DEF@84..90
+        NAME@84..85
+          IDENT@84..85 "a"
+        COLON@85..86 ":"
+        WHITESPACE@86..87 " "
+        PATH_TYPE@87..90
+          PATH@87..90
+            PATH_SEGMENT@87..90
+              NAME_REF@87..90
+                IDENT@87..90 "i32"
+      COMMA@90..91 ","
+      WHITESPACE@91..96 "\n    "
+      RECORD_FIELD_DEF@96..102
+        NAME@96..97
+          IDENT@96..97 "b"
+        COLON@97..98 ":"
+        WHITESPACE@98..99 " "
+        PATH_TYPE@99..102
+          PATH@99..102
+            PATH_SEGMENT@99..102
+              NAME_REF@99..102
+                IDENT@99..102 "f32"
+      COMMA@102..103 ","
+      WHITESPACE@103..104 "\n"
+      R_CURLY@104..105 "}"
+  WHITESPACE@105..106 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
index 79d193616..9cd8910d4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
@@ -1,19 +1,19 @@
-SOURCE_FILE@[0; 16)
-  TYPE_ALIAS_DEF@[0; 15)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    PAREN_TYPE@[9; 14)
-      L_PAREN@[9; 10) "("
-      PATH_TYPE@[10; 13)
-        PATH@[10; 13)
-          PATH_SEGMENT@[10; 13)
-            NAME_REF@[10; 13)
-              IDENT@[10; 13) "i32"
-      R_PAREN@[13; 14) ")"
-    SEMICOLON@[14; 15) ";"
-  WHITESPACE@[15; 16) "\n"
+SOURCE_FILE@0..16
+  TYPE_ALIAS_DEF@0..15
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    PAREN_TYPE@9..14
+      L_PAREN@9..10 "("
+      PATH_TYPE@10..13
+        PATH@10..13
+          PATH_SEGMENT@10..13
+            NAME_REF@10..13
+              IDENT@10..13 "i32"
+      R_PAREN@13..14 ")"
+    SEMICOLON@14..15 ";"
+  WHITESPACE@15..16 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index c2cec89b4..b165789fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -1,136 +1,136 @@
-SOURCE_FILE@[0; 189)
-  FN_DEF@[0; 188)
-    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; 188)
-      BLOCK@[9; 188)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 28)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          LITERAL@[23; 27)
-            TRUE_KW@[23; 27) "true"
-          SEMICOLON@[27; 28) ";"
-        WHITESPACE@[28; 33) "\n    "
-        LET_STMT@[33; 47)
-          LET_KW@[33; 36) "let"
-          WHITESPACE@[36; 37) " "
-          PLACEHOLDER_PAT@[37; 38)
-            UNDERSCORE@[37; 38) "_"
-          WHITESPACE@[38; 39) " "
-          EQ@[39; 40) "="
-          WHITESPACE@[40; 41) " "
-          LITERAL@[41; 46)
-            FALSE_KW@[41; 46) "false"
-          SEMICOLON@[46; 47) ";"
-        WHITESPACE@[47; 52) "\n    "
-        LET_STMT@[52; 62)
-          LET_KW@[52; 55) "let"
-          WHITESPACE@[55; 56) " "
-          PLACEHOLDER_PAT@[56; 57)
-            UNDERSCORE@[56; 57) "_"
-          WHITESPACE@[57; 58) " "
-          EQ@[58; 59) "="
-          WHITESPACE@[59; 60) " "
-          LITERAL@[60; 61)
-            INT_NUMBER@[60; 61) "1"
-          SEMICOLON@[61; 62) ";"
-        WHITESPACE@[62; 67) "\n    "
-        LET_STMT@[67; 79)
-          LET_KW@[67; 70) "let"
-          WHITESPACE@[70; 71) " "
-          PLACEHOLDER_PAT@[71; 72)
-            UNDERSCORE@[71; 72) "_"
-          WHITESPACE@[72; 73) " "
-          EQ@[73; 74) "="
-          WHITESPACE@[74; 75) " "
-          LITERAL@[75; 78)
-            FLOAT_NUMBER@[75; 78) "2.0"
-          SEMICOLON@[78; 79) ";"
-        WHITESPACE@[79; 84) "\n    "
-        LET_STMT@[84; 97)
-          LET_KW@[84; 87) "let"
-          WHITESPACE@[87; 88) " "
-          PLACEHOLDER_PAT@[88; 89)
-            UNDERSCORE@[88; 89) "_"
-          WHITESPACE@[89; 90) " "
-          EQ@[90; 91) "="
-          WHITESPACE@[91; 92) " "
-          LITERAL@[92; 96)
-            BYTE@[92; 96) "b\'a\'"
-          SEMICOLON@[96; 97) ";"
-        WHITESPACE@[97; 102) "\n    "
-        LET_STMT@[102; 114)
-          LET_KW@[102; 105) "let"
-          WHITESPACE@[105; 106) " "
-          PLACEHOLDER_PAT@[106; 107)
-            UNDERSCORE@[106; 107) "_"
-          WHITESPACE@[107; 108) " "
-          EQ@[108; 109) "="
-          WHITESPACE@[109; 110) " "
-          LITERAL@[110; 113)
-            CHAR@[110; 113) "\'b\'"
-          SEMICOLON@[113; 114) ";"
-        WHITESPACE@[114; 119) "\n    "
-        LET_STMT@[119; 131)
-          LET_KW@[119; 122) "let"
-          WHITESPACE@[122; 123) " "
-          PLACEHOLDER_PAT@[123; 124)
-            UNDERSCORE@[123; 124) "_"
-          WHITESPACE@[124; 125) " "
-          EQ@[125; 126) "="
-          WHITESPACE@[126; 127) " "
-          LITERAL@[127; 130)
-            STRING@[127; 130) "\"c\""
-          SEMICOLON@[130; 131) ";"
-        WHITESPACE@[131; 136) "\n    "
-        LET_STMT@[136; 149)
-          LET_KW@[136; 139) "let"
-          WHITESPACE@[139; 140) " "
-          PLACEHOLDER_PAT@[140; 141)
-            UNDERSCORE@[140; 141) "_"
-          WHITESPACE@[141; 142) " "
-          EQ@[142; 143) "="
-          WHITESPACE@[143; 144) " "
-          LITERAL@[144; 148)
-            RAW_STRING@[144; 148) "r\"d\""
-          SEMICOLON@[148; 149) ";"
-        WHITESPACE@[149; 154) "\n    "
-        LET_STMT@[154; 167)
-          LET_KW@[154; 157) "let"
-          WHITESPACE@[157; 158) " "
-          PLACEHOLDER_PAT@[158; 159)
-            UNDERSCORE@[158; 159) "_"
-          WHITESPACE@[159; 160) " "
-          EQ@[160; 161) "="
-          WHITESPACE@[161; 162) " "
-          LITERAL@[162; 166)
-            BYTE_STRING@[162; 166) "b\"e\""
-          SEMICOLON@[166; 167) ";"
-        WHITESPACE@[167; 172) "\n    "
-        LET_STMT@[172; 186)
-          LET_KW@[172; 175) "let"
-          WHITESPACE@[175; 176) " "
-          PLACEHOLDER_PAT@[176; 177)
-            UNDERSCORE@[176; 177) "_"
-          WHITESPACE@[177; 178) " "
-          EQ@[178; 179) "="
-          WHITESPACE@[179; 180) " "
-          LITERAL@[180; 185)
-            RAW_BYTE_STRING@[180; 185) "br\"f\""
-          SEMICOLON@[185; 186) ";"
-        WHITESPACE@[186; 187) "\n"
-        R_CURLY@[187; 188) "}"
-  WHITESPACE@[188; 189) "\n"
+SOURCE_FILE@0..189
+  FN_DEF@0..188
+    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..188
+      BLOCK@9..188
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..28
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          LITERAL@23..27
+            TRUE_KW@23..27 "true"
+          SEMICOLON@27..28 ";"
+        WHITESPACE@28..33 "\n    "
+        LET_STMT@33..47
+          LET_KW@33..36 "let"
+          WHITESPACE@36..37 " "
+          PLACEHOLDER_PAT@37..38
+            UNDERSCORE@37..38 "_"
+          WHITESPACE@38..39 " "
+          EQ@39..40 "="
+          WHITESPACE@40..41 " "
+          LITERAL@41..46
+            FALSE_KW@41..46 "false"
+          SEMICOLON@46..47 ";"
+        WHITESPACE@47..52 "\n    "
+        LET_STMT@52..62
+          LET_KW@52..55 "let"
+          WHITESPACE@55..56 " "
+          PLACEHOLDER_PAT@56..57
+            UNDERSCORE@56..57 "_"
+          WHITESPACE@57..58 " "
+          EQ@58..59 "="
+          WHITESPACE@59..60 " "
+          LITERAL@60..61
+            INT_NUMBER@60..61 "1"
+          SEMICOLON@61..62 ";"
+        WHITESPACE@62..67 "\n    "
+        LET_STMT@67..79
+          LET_KW@67..70 "let"
+          WHITESPACE@70..71 " "
+          PLACEHOLDER_PAT@71..72
+            UNDERSCORE@71..72 "_"
+          WHITESPACE@72..73 " "
+          EQ@73..74 "="
+          WHITESPACE@74..75 " "
+          LITERAL@75..78
+            FLOAT_NUMBER@75..78 "2.0"
+          SEMICOLON@78..79 ";"
+        WHITESPACE@79..84 "\n    "
+        LET_STMT@84..97
+          LET_KW@84..87 "let"
+          WHITESPACE@87..88 " "
+          PLACEHOLDER_PAT@88..89
+            UNDERSCORE@88..89 "_"
+          WHITESPACE@89..90 " "
+          EQ@90..91 "="
+          WHITESPACE@91..92 " "
+          LITERAL@92..96
+            BYTE@92..96 "b\'a\'"
+          SEMICOLON@96..97 ";"
+        WHITESPACE@97..102 "\n    "
+        LET_STMT@102..114
+          LET_KW@102..105 "let"
+          WHITESPACE@105..106 " "
+          PLACEHOLDER_PAT@106..107
+            UNDERSCORE@106..107 "_"
+          WHITESPACE@107..108 " "
+          EQ@108..109 "="
+          WHITESPACE@109..110 " "
+          LITERAL@110..113
+            CHAR@110..113 "\'b\'"
+          SEMICOLON@113..114 ";"
+        WHITESPACE@114..119 "\n    "
+        LET_STMT@119..131
+          LET_KW@119..122 "let"
+          WHITESPACE@122..123 " "
+          PLACEHOLDER_PAT@123..124
+            UNDERSCORE@123..124 "_"
+          WHITESPACE@124..125 " "
+          EQ@125..126 "="
+          WHITESPACE@126..127 " "
+          LITERAL@127..130
+            STRING@127..130 "\"c\""
+          SEMICOLON@130..131 ";"
+        WHITESPACE@131..136 "\n    "
+        LET_STMT@136..149
+          LET_KW@136..139 "let"
+          WHITESPACE@139..140 " "
+          PLACEHOLDER_PAT@140..141
+            UNDERSCORE@140..141 "_"
+          WHITESPACE@141..142 " "
+          EQ@142..143 "="
+          WHITESPACE@143..144 " "
+          LITERAL@144..148
+            RAW_STRING@144..148 "r\"d\""
+          SEMICOLON@148..149 ";"
+        WHITESPACE@149..154 "\n    "
+        LET_STMT@154..167
+          LET_KW@154..157 "let"
+          WHITESPACE@157..158 " "
+          PLACEHOLDER_PAT@158..159
+            UNDERSCORE@158..159 "_"
+          WHITESPACE@159..160 " "
+          EQ@160..161 "="
+          WHITESPACE@161..162 " "
+          LITERAL@162..166
+            BYTE_STRING@162..166 "b\"e\""
+          SEMICOLON@166..167 ";"
+        WHITESPACE@167..172 "\n    "
+        LET_STMT@172..186
+          LET_KW@172..175 "let"
+          WHITESPACE@175..176 " "
+          PLACEHOLDER_PAT@176..177
+            UNDERSCORE@176..177 "_"
+          WHITESPACE@177..178 " "
+          EQ@178..179 "="
+          WHITESPACE@179..180 " "
+          LITERAL@180..185
+            RAW_BYTE_STRING@180..185 "br\"f\""
+          SEMICOLON@185..186 ";"
+        WHITESPACE@186..187 "\n"
+        R_CURLY@187..188 "}"
+  WHITESPACE@188..189 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
index ca1a97161..36f17133d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
@@ -1,36 +1,36 @@
-SOURCE_FILE@[0; 30)
-  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) "}"
-  WHITESPACE@[11; 12) "\n"
-  FN_DEF@[12; 29)
-    FN_KW@[12; 14) "fn"
-    WHITESPACE@[14; 15) " "
-    NAME@[15; 18)
-      IDENT@[15; 18) "bar"
-    PARAM_LIST@[18; 20)
-      L_PAREN@[18; 19) "("
-      R_PAREN@[19; 20) ")"
-    WHITESPACE@[20; 21) " "
-    RET_TYPE@[21; 26)
-      THIN_ARROW@[21; 23) "->"
-      WHITESPACE@[23; 24) " "
-      TUPLE_TYPE@[24; 26)
-        L_PAREN@[24; 25) "("
-        R_PAREN@[25; 26) ")"
-    WHITESPACE@[26; 27) " "
-    BLOCK_EXPR@[27; 29)
-      BLOCK@[27; 29)
-        L_CURLY@[27; 28) "{"
-        R_CURLY@[28; 29) "}"
-  WHITESPACE@[29; 30) "\n"
+SOURCE_FILE@0..30
+  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 "}"
+  WHITESPACE@11..12 "\n"
+  FN_DEF@12..29
+    FN_KW@12..14 "fn"
+    WHITESPACE@14..15 " "
+    NAME@15..18
+      IDENT@15..18 "bar"
+    PARAM_LIST@18..20
+      L_PAREN@18..19 "("
+      R_PAREN@19..20 ")"
+    WHITESPACE@20..21 " "
+    RET_TYPE@21..26
+      THIN_ARROW@21..23 "->"
+      WHITESPACE@23..24 " "
+      TUPLE_TYPE@24..26
+        L_PAREN@24..25 "("
+        R_PAREN@25..26 ")"
+    WHITESPACE@26..27 " "
+    BLOCK_EXPR@27..29
+      BLOCK@27..29
+        L_CURLY@27..28 "{"
+        R_CURLY@28..29 "}"
+  WHITESPACE@29..30 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
index e614acc6f..01ed3afca 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
@@ -1,16 +1,16 @@
-SOURCE_FILE@[0; 19)
-  IMPL_DEF@[0; 18)
-    UNSAFE_KW@[0; 6) "unsafe"
-    WHITESPACE@[6; 7) " "
-    IMPL_KW@[7; 11) "impl"
-    WHITESPACE@[11; 12) " "
-    PATH_TYPE@[12; 15)
-      PATH@[12; 15)
-        PATH_SEGMENT@[12; 15)
-          NAME_REF@[12; 15)
-            IDENT@[12; 15) "Foo"
-    WHITESPACE@[15; 16) " "
-    ITEM_LIST@[16; 18)
-      L_CURLY@[16; 17) "{"
-      R_CURLY@[17; 18) "}"
-  WHITESPACE@[18; 19) "\n"
+SOURCE_FILE@0..19
+  IMPL_DEF@0..18
+    UNSAFE_KW@0..6 "unsafe"
+    WHITESPACE@6..7 " "
+    IMPL_KW@7..11 "impl"
+    WHITESPACE@11..12 " "
+    PATH_TYPE@12..15
+      PATH@12..15
+        PATH_SEGMENT@12..15
+          NAME_REF@12..15
+            IDENT@12..15 "Foo"
+    WHITESPACE@15..16 " "
+    ITEM_LIST@16..18
+      L_CURLY@16..17 "{"
+      R_CURLY@17..18 "}"
+  WHITESPACE@18..19 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index b23f43b46..ca5aa007e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
@@ -1,69 +1,69 @@
-SOURCE_FILE@[0; 88)
-  FN_DEF@[0; 87)
-    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) ")"
-    BLOCK_EXPR@[8; 87)
-      BLOCK@[8; 87)
-        L_CURLY@[8; 9) "{"
-        WHITESPACE@[9; 14) "\n    "
-        EXPR_STMT@[14; 25)
-          IF_EXPR@[14; 25)
-            IF_KW@[14; 16) "if"
-            WHITESPACE@[16; 17) " "
-            CONDITION@[17; 22)
-              BREAK_EXPR@[17; 22)
-                BREAK_KW@[17; 22) "break"
-            WHITESPACE@[22; 23) " "
-            BLOCK_EXPR@[23; 25)
-              BLOCK@[23; 25)
-                L_CURLY@[23; 24) "{"
-                R_CURLY@[24; 25) "}"
-        WHITESPACE@[25; 30) "\n    "
-        EXPR_STMT@[30; 44)
-          WHILE_EXPR@[30; 44)
-            WHILE_KW@[30; 35) "while"
-            WHITESPACE@[35; 36) " "
-            CONDITION@[36; 41)
-              BREAK_EXPR@[36; 41)
-                BREAK_KW@[36; 41) "break"
-            WHITESPACE@[41; 42) " "
-            BLOCK_EXPR@[42; 44)
-              BLOCK@[42; 44)
-                L_CURLY@[42; 43) "{"
-                R_CURLY@[43; 44) "}"
-        WHITESPACE@[44; 49) "\n    "
-        EXPR_STMT@[49; 66)
-          FOR_EXPR@[49; 66)
-            FOR_KW@[49; 52) "for"
-            WHITESPACE@[52; 53) " "
-            BIND_PAT@[53; 54)
-              NAME@[53; 54)
-                IDENT@[53; 54) "i"
-            WHITESPACE@[54; 55) " "
-            IN_KW@[55; 57) "in"
-            WHITESPACE@[57; 58) " "
-            BREAK_EXPR@[58; 63)
-              BREAK_KW@[58; 63) "break"
-            WHITESPACE@[63; 64) " "
-            BLOCK_EXPR@[64; 66)
-              BLOCK@[64; 66)
-                L_CURLY@[64; 65) "{"
-                R_CURLY@[65; 66) "}"
-        WHITESPACE@[66; 71) "\n    "
-        MATCH_EXPR@[71; 85)
-          MATCH_KW@[71; 76) "match"
-          WHITESPACE@[76; 77) " "
-          BREAK_EXPR@[77; 82)
-            BREAK_KW@[77; 82) "break"
-          WHITESPACE@[82; 83) " "
-          MATCH_ARM_LIST@[83; 85)
-            L_CURLY@[83; 84) "{"
-            R_CURLY@[84; 85) "}"
-        WHITESPACE@[85; 86) "\n"
-        R_CURLY@[86; 87) "}"
-  WHITESPACE@[87; 88) "\n"
+SOURCE_FILE@0..88
+  FN_DEF@0..87
+    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 ")"
+    BLOCK_EXPR@8..87
+      BLOCK@8..87
+        L_CURLY@8..9 "{"
+        WHITESPACE@9..14 "\n    "
+        EXPR_STMT@14..25
+          IF_EXPR@14..25
+            IF_KW@14..16 "if"
+            WHITESPACE@16..17 " "
+            CONDITION@17..22
+              BREAK_EXPR@17..22
+                BREAK_KW@17..22 "break"
+            WHITESPACE@22..23 " "
+            BLOCK_EXPR@23..25
+              BLOCK@23..25
+                L_CURLY@23..24 "{"
+                R_CURLY@24..25 "}"
+        WHITESPACE@25..30 "\n    "
+        EXPR_STMT@30..44
+          WHILE_EXPR@30..44
+            WHILE_KW@30..35 "while"
+            WHITESPACE@35..36 " "
+            CONDITION@36..41
+              BREAK_EXPR@36..41
+                BREAK_KW@36..41 "break"
+            WHITESPACE@41..42 " "
+            BLOCK_EXPR@42..44
+              BLOCK@42..44
+                L_CURLY@42..43 "{"
+                R_CURLY@43..44 "}"
+        WHITESPACE@44..49 "\n    "
+        EXPR_STMT@49..66
+          FOR_EXPR@49..66
+            FOR_KW@49..52 "for"
+            WHITESPACE@52..53 " "
+            BIND_PAT@53..54
+              NAME@53..54
+                IDENT@53..54 "i"
+            WHITESPACE@54..55 " "
+            IN_KW@55..57 "in"
+            WHITESPACE@57..58 " "
+            BREAK_EXPR@58..63
+              BREAK_KW@58..63 "break"
+            WHITESPACE@63..64 " "
+            BLOCK_EXPR@64..66
+              BLOCK@64..66
+                L_CURLY@64..65 "{"
+                R_CURLY@65..66 "}"
+        WHITESPACE@66..71 "\n    "
+        MATCH_EXPR@71..85
+          MATCH_KW@71..76 "match"
+          WHITESPACE@76..77 " "
+          BREAK_EXPR@77..82
+            BREAK_KW@77..82 "break"
+          WHITESPACE@82..83 " "
+          MATCH_ARM_LIST@83..85
+            L_CURLY@83..84 "{"
+            R_CURLY@84..85 "}"
+        WHITESPACE@85..86 "\n"
+        R_CURLY@86..87 "}"
+  WHITESPACE@87..88 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
index b494f6c59..1c1e349e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
@@ -1,18 +1,18 @@
-SOURCE_FILE@[0; 19)
-  FN_DEF@[0; 18)
-    ABI@[0; 6)
-      EXTERN_KW@[0; 6) "extern"
-    WHITESPACE@[6; 7) " "
-    FN_KW@[7; 9) "fn"
-    WHITESPACE@[9; 10) " "
-    NAME@[10; 13)
-      IDENT@[10; 13) "foo"
-    PARAM_LIST@[13; 15)
-      L_PAREN@[13; 14) "("
-      R_PAREN@[14; 15) ")"
-    WHITESPACE@[15; 16) " "
-    BLOCK_EXPR@[16; 18)
-      BLOCK@[16; 18)
-        L_CURLY@[16; 17) "{"
-        R_CURLY@[17; 18) "}"
-  WHITESPACE@[18; 19) "\n"
+SOURCE_FILE@0..19
+  FN_DEF@0..18
+    ABI@0..6
+      EXTERN_KW@0..6 "extern"
+    WHITESPACE@6..7 " "
+    FN_KW@7..9 "fn"
+    WHITESPACE@9..10 " "
+    NAME@10..13
+      IDENT@10..13 "foo"
+    PARAM_LIST@13..15
+      L_PAREN@13..14 "("
+      R_PAREN@14..15 ")"
+    WHITESPACE@15..16 " "
+    BLOCK_EXPR@16..18
+      BLOCK@16..18
+        L_CURLY@16..17 "{"
+        R_CURLY@17..18 "}"
+  WHITESPACE@18..19 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
index 1d7796449..cee2bc906 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
@@ -1,22 +1,22 @@
-SOURCE_FILE@[0; 19)
-  STRUCT_DEF@[0; 18)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 8)
-      IDENT@[7; 8) "S"
-    TYPE_PARAM_LIST@[8; 17)
-      L_ANGLE@[8; 9) "<"
-      TYPE_PARAM@[9; 16)
-        NAME@[9; 10)
-          IDENT@[9; 10) "T"
-        WHITESPACE@[10; 11) " "
-        EQ@[11; 12) "="
-        WHITESPACE@[12; 13) " "
-        PATH_TYPE@[13; 16)
-          PATH@[13; 16)
-            PATH_SEGMENT@[13; 16)
-              NAME_REF@[13; 16)
-                IDENT@[13; 16) "i32"
-      R_ANGLE@[16; 17) ">"
-    SEMICOLON@[17; 18) ";"
-  WHITESPACE@[18; 19) "\n"
+SOURCE_FILE@0..19
+  STRUCT_DEF@0..18
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..8
+      IDENT@7..8 "S"
+    TYPE_PARAM_LIST@8..17
+      L_ANGLE@8..9 "<"
+      TYPE_PARAM@9..16
+        NAME@9..10
+          IDENT@9..10 "T"
+        WHITESPACE@10..11 " "
+        EQ@11..12 "="
+        WHITESPACE@12..13 " "
+        PATH_TYPE@13..16
+          PATH@13..16
+            PATH_SEGMENT@13..16
+              NAME_REF@13..16
+                IDENT@13..16 "i32"
+      R_ANGLE@16..17 ">"
+    SEMICOLON@17..18 ";"
+  WHITESPACE@18..19 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
index 7093c2b1f..800412cef 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
@@ -1,13 +1,13 @@
-SOURCE_FILE@[0; 16)
-  TRAIT_DEF@[0; 15)
-    AUTO_KW@[0; 4) "auto"
-    WHITESPACE@[4; 5) " "
-    TRAIT_KW@[5; 10) "trait"
-    WHITESPACE@[10; 11) " "
-    NAME@[11; 12)
-      IDENT@[11; 12) "T"
-    WHITESPACE@[12; 13) " "
-    ITEM_LIST@[13; 15)
-      L_CURLY@[13; 14) "{"
-      R_CURLY@[14; 15) "}"
-  WHITESPACE@[15; 16) "\n"
+SOURCE_FILE@0..16
+  TRAIT_DEF@0..15
+    AUTO_KW@0..4 "auto"
+    WHITESPACE@4..5 " "
+    TRAIT_KW@5..10 "trait"
+    WHITESPACE@10..11 " "
+    NAME@11..12
+      IDENT@11..12 "T"
+    WHITESPACE@12..13 " "
+    ITEM_LIST@13..15
+      L_CURLY@13..14 "{"
+      R_CURLY@14..15 "}"
+  WHITESPACE@15..16 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
index db6013c6f..1e2d7db7c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
@@ -1,23 +1,23 @@
-SOURCE_FILE@[0; 21)
-  TYPE_ALIAS_DEF@[0; 20)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "F"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    FN_POINTER_TYPE@[9; 19)
-      FN_KW@[9; 11) "fn"
-      PARAM_LIST@[11; 13)
-        L_PAREN@[11; 12) "("
-        R_PAREN@[12; 13) ")"
-      WHITESPACE@[13; 14) " "
-      RET_TYPE@[14; 19)
-        THIN_ARROW@[14; 16) "->"
-        WHITESPACE@[16; 17) " "
-        TUPLE_TYPE@[17; 19)
-          L_PAREN@[17; 18) "("
-          R_PAREN@[18; 19) ")"
-    SEMICOLON@[19; 20) ";"
-  WHITESPACE@[20; 21) "\n"
+SOURCE_FILE@0..21
+  TYPE_ALIAS_DEF@0..20
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "F"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    FN_POINTER_TYPE@9..19
+      FN_KW@9..11 "fn"
+      PARAM_LIST@11..13
+        L_PAREN@11..12 "("
+        R_PAREN@12..13 ")"
+      WHITESPACE@13..14 " "
+      RET_TYPE@14..19
+        THIN_ARROW@14..16 "->"
+        WHITESPACE@16..17 " "
+        TUPLE_TYPE@17..19
+          L_PAREN@17..18 "("
+          R_PAREN@18..19 ")"
+    SEMICOLON@19..20 ";"
+  WHITESPACE@20..21 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
index 118cfc096..c264dae5e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
@@ -1,34 +1,34 @@
-SOURCE_FILE@[0; 26)
-  FN_DEF@[0; 25)
-    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; 25)
-      BLOCK@[9; 25)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 23)
-          INDEX_EXPR@[15; 22)
-            INDEX_EXPR@[15; 19)
-              PATH_EXPR@[15; 16)
-                PATH@[15; 16)
-                  PATH_SEGMENT@[15; 16)
-                    NAME_REF@[15; 16)
-                      IDENT@[15; 16) "x"
-              L_BRACK@[16; 17) "["
-              LITERAL@[17; 18)
-                INT_NUMBER@[17; 18) "1"
-              R_BRACK@[18; 19) "]"
-            L_BRACK@[19; 20) "["
-            LITERAL@[20; 21)
-              INT_NUMBER@[20; 21) "2"
-            R_BRACK@[21; 22) "]"
-          SEMICOLON@[22; 23) ";"
-        WHITESPACE@[23; 24) "\n"
-        R_CURLY@[24; 25) "}"
-  WHITESPACE@[25; 26) "\n"
+SOURCE_FILE@0..26
+  FN_DEF@0..25
+    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..25
+      BLOCK@9..25
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..23
+          INDEX_EXPR@15..22
+            INDEX_EXPR@15..19
+              PATH_EXPR@15..16
+                PATH@15..16
+                  PATH_SEGMENT@15..16
+                    NAME_REF@15..16
+                      IDENT@15..16 "x"
+              L_BRACK@16..17 "["
+              LITERAL@17..18
+                INT_NUMBER@17..18 "1"
+              R_BRACK@18..19 "]"
+            L_BRACK@19..20 "["
+            LITERAL@20..21
+              INT_NUMBER@20..21 "2"
+            R_BRACK@21..22 "]"
+          SEMICOLON@22..23 ";"
+        WHITESPACE@23..24 "\n"
+        R_CURLY@24..25 "}"
+  WHITESPACE@25..26 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
index 3da3beaf4..9370f6ae7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
@@ -1,15 +1,15 @@
-SOURCE_FILE@[0; 23)
-  TRAIT_DEF@[0; 22)
-    UNSAFE_KW@[0; 6) "unsafe"
-    WHITESPACE@[6; 7) " "
-    AUTO_KW@[7; 11) "auto"
-    WHITESPACE@[11; 12) " "
-    TRAIT_KW@[12; 17) "trait"
-    WHITESPACE@[17; 18) " "
-    NAME@[18; 19)
-      IDENT@[18; 19) "T"
-    WHITESPACE@[19; 20) " "
-    ITEM_LIST@[20; 22)
-      L_CURLY@[20; 21) "{"
-      R_CURLY@[21; 22) "}"
-  WHITESPACE@[22; 23) "\n"
+SOURCE_FILE@0..23
+  TRAIT_DEF@0..22
+    UNSAFE_KW@0..6 "unsafe"
+    WHITESPACE@6..7 " "
+    AUTO_KW@7..11 "auto"
+    WHITESPACE@11..12 " "
+    TRAIT_KW@12..17 "trait"
+    WHITESPACE@17..18 " "
+    NAME@18..19
+      IDENT@18..19 "T"
+    WHITESPACE@19..20 " "
+    ITEM_LIST@20..22
+      L_CURLY@20..21 "{"
+      R_CURLY@21..22 "}"
+  WHITESPACE@22..23 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index ebe7816a4..24e1ba8a0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
@@ -1,29 +1,29 @@
-SOURCE_FILE@[0; 26)
-  FN_DEF@[0; 25)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 25)
-      BLOCK@[10; 25)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 12) " "
-        LET_STMT@[12; 23)
-          LET_KW@[12; 15) "let"
-          WHITESPACE@[15; 16) " "
-          PLACEHOLDER_PAT@[16; 17)
-            UNDERSCORE@[16; 17) "_"
-          WHITESPACE@[17; 18) " "
-          EQ@[18; 19) "="
-          WHITESPACE@[19; 20) " "
-          TUPLE_EXPR@[20; 22)
-            L_PAREN@[20; 21) "("
-            R_PAREN@[21; 22) ")"
-          SEMICOLON@[22; 23) ";"
-        WHITESPACE@[23; 24) " "
-        R_CURLY@[24; 25) "}"
-  WHITESPACE@[25; 26) "\n"
+SOURCE_FILE@0..26
+  FN_DEF@0..25
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..25
+      BLOCK@10..25
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..12 " "
+        LET_STMT@12..23
+          LET_KW@12..15 "let"
+          WHITESPACE@15..16 " "
+          PLACEHOLDER_PAT@16..17
+            UNDERSCORE@16..17 "_"
+          WHITESPACE@17..18 " "
+          EQ@18..19 "="
+          WHITESPACE@19..20 " "
+          TUPLE_EXPR@20..22
+            L_PAREN@20..21 "("
+            R_PAREN@21..22 ")"
+          SEMICOLON@22..23 ";"
+        WHITESPACE@23..24 " "
+        R_CURLY@24..25 "}"
+  WHITESPACE@25..26 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index 6bd6f5a6b..47462d44e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -1,130 +1,130 @@
-SOURCE_FILE@[0; 167)
-  FN_DEF@[0; 166)
-    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; 166)
-      BLOCK@[9; 166)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 25)
-          IF_EXPR@[15; 25)
-            IF_KW@[15; 17) "if"
-            WHITESPACE@[17; 18) " "
-            CONDITION@[18; 22)
-              LITERAL@[18; 22)
-                TRUE_KW@[18; 22) "true"
-            WHITESPACE@[22; 23) " "
-            BLOCK_EXPR@[23; 25)
-              BLOCK@[23; 25)
-                L_CURLY@[23; 24) "{"
-                R_CURLY@[24; 25) "}"
-        WHITESPACE@[25; 30) "\n    "
-        EXPR_STMT@[30; 37)
-          LOOP_EXPR@[30; 37)
-            LOOP_KW@[30; 34) "loop"
-            WHITESPACE@[34; 35) " "
-            BLOCK_EXPR@[35; 37)
-              BLOCK@[35; 37)
-                L_CURLY@[35; 36) "{"
-                R_CURLY@[36; 37) "}"
-        WHITESPACE@[37; 42) "\n    "
-        EXPR_STMT@[42; 53)
-          MATCH_EXPR@[42; 53)
-            MATCH_KW@[42; 47) "match"
-            WHITESPACE@[47; 48) " "
-            TUPLE_EXPR@[48; 50)
-              L_PAREN@[48; 49) "("
-              R_PAREN@[49; 50) ")"
-            WHITESPACE@[50; 51) " "
-            MATCH_ARM_LIST@[51; 53)
-              L_CURLY@[51; 52) "{"
-              R_CURLY@[52; 53) "}"
-        WHITESPACE@[53; 58) "\n    "
-        EXPR_STMT@[58; 71)
-          WHILE_EXPR@[58; 71)
-            WHILE_KW@[58; 63) "while"
-            WHITESPACE@[63; 64) " "
-            CONDITION@[64; 68)
-              LITERAL@[64; 68)
-                TRUE_KW@[64; 68) "true"
-            WHITESPACE@[68; 69) " "
-            BLOCK_EXPR@[69; 71)
-              BLOCK@[69; 71)
-                L_CURLY@[69; 70) "{"
-                R_CURLY@[70; 71) "}"
-        WHITESPACE@[71; 76) "\n    "
-        EXPR_STMT@[76; 90)
-          FOR_EXPR@[76; 90)
-            FOR_KW@[76; 79) "for"
-            WHITESPACE@[79; 80) " "
-            PLACEHOLDER_PAT@[80; 81)
-              UNDERSCORE@[80; 81) "_"
-            WHITESPACE@[81; 82) " "
-            IN_KW@[82; 84) "in"
-            WHITESPACE@[84; 85) " "
-            TUPLE_EXPR@[85; 87)
-              L_PAREN@[85; 86) "("
-              R_PAREN@[86; 87) ")"
-            WHITESPACE@[87; 88) " "
-            BLOCK_EXPR@[88; 90)
-              BLOCK@[88; 90)
-                L_CURLY@[88; 89) "{"
-                R_CURLY@[89; 90) "}"
-        WHITESPACE@[90; 95) "\n    "
-        EXPR_STMT@[95; 97)
-          BLOCK_EXPR@[95; 97)
-            BLOCK@[95; 97)
-              L_CURLY@[95; 96) "{"
-              R_CURLY@[96; 97) "}"
-        WHITESPACE@[97; 102) "\n    "
-        EXPR_STMT@[102; 104)
-          BLOCK_EXPR@[102; 104)
-            BLOCK@[102; 104)
-              L_CURLY@[102; 103) "{"
-              R_CURLY@[103; 104) "}"
-        WHITESPACE@[104; 109) "\n    "
-        EXPR_STMT@[109; 152)
-          MACRO_CALL@[109; 152)
-            PATH@[109; 120)
-              PATH_SEGMENT@[109; 120)
-                NAME_REF@[109; 120)
-                  IDENT@[109; 120) "macro_rules"
-            BANG@[120; 121) "!"
-            WHITESPACE@[121; 122) " "
-            NAME@[122; 126)
-              IDENT@[122; 126) "test"
-            WHITESPACE@[126; 127) " "
-            TOKEN_TREE@[127; 152)
-              L_CURLY@[127; 128) "{"
-              WHITESPACE@[128; 138) "\n         "
-              TOKEN_TREE@[138; 140)
-                L_PAREN@[138; 139) "("
-                R_PAREN@[139; 140) ")"
-              WHITESPACE@[140; 141) " "
-              EQ@[141; 142) "="
-              R_ANGLE@[142; 143) ">"
-              WHITESPACE@[143; 144) " "
-              TOKEN_TREE@[144; 146)
-                L_CURLY@[144; 145) "{"
-                R_CURLY@[145; 146) "}"
-              WHITESPACE@[146; 151) "\n    "
-              R_CURLY@[151; 152) "}"
-        WHITESPACE@[152; 157) "\n    "
-        MACRO_CALL@[157; 164)
-          PATH@[157; 161)
-            PATH_SEGMENT@[157; 161)
-              NAME_REF@[157; 161)
-                IDENT@[157; 161) "test"
-          BANG@[161; 162) "!"
-          TOKEN_TREE@[162; 164)
-            L_CURLY@[162; 163) "{"
-            R_CURLY@[163; 164) "}"
-        WHITESPACE@[164; 165) "\n"
-        R_CURLY@[165; 166) "}"
-  WHITESPACE@[166; 167) "\n"
+SOURCE_FILE@0..167
+  FN_DEF@0..166
+    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..166
+      BLOCK@9..166
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..25
+          IF_EXPR@15..25
+            IF_KW@15..17 "if"
+            WHITESPACE@17..18 " "
+            CONDITION@18..22
+              LITERAL@18..22
+                TRUE_KW@18..22 "true"
+            WHITESPACE@22..23 " "
+            BLOCK_EXPR@23..25
+              BLOCK@23..25
+                L_CURLY@23..24 "{"
+                R_CURLY@24..25 "}"
+        WHITESPACE@25..30 "\n    "
+        EXPR_STMT@30..37
+          LOOP_EXPR@30..37
+            LOOP_KW@30..34 "loop"
+            WHITESPACE@34..35 " "
+            BLOCK_EXPR@35..37
+              BLOCK@35..37
+                L_CURLY@35..36 "{"
+                R_CURLY@36..37 "}"
+        WHITESPACE@37..42 "\n    "
+        EXPR_STMT@42..53
+          MATCH_EXPR@42..53
+            MATCH_KW@42..47 "match"
+            WHITESPACE@47..48 " "
+            TUPLE_EXPR@48..50
+              L_PAREN@48..49 "("
+              R_PAREN@49..50 ")"
+            WHITESPACE@50..51 " "
+            MATCH_ARM_LIST@51..53
+              L_CURLY@51..52 "{"
+              R_CURLY@52..53 "}"
+        WHITESPACE@53..58 "\n    "
+        EXPR_STMT@58..71
+          WHILE_EXPR@58..71
+            WHILE_KW@58..63 "while"
+            WHITESPACE@63..64 " "
+            CONDITION@64..68
+              LITERAL@64..68
+                TRUE_KW@64..68 "true"
+            WHITESPACE@68..69 " "
+            BLOCK_EXPR@69..71
+              BLOCK@69..71
+                L_CURLY@69..70 "{"
+                R_CURLY@70..71 "}"
+        WHITESPACE@71..76 "\n    "
+        EXPR_STMT@76..90
+          FOR_EXPR@76..90
+            FOR_KW@76..79 "for"
+            WHITESPACE@79..80 " "
+            PLACEHOLDER_PAT@80..81
+              UNDERSCORE@80..81 "_"
+            WHITESPACE@81..82 " "
+            IN_KW@82..84 "in"
+            WHITESPACE@84..85 " "
+            TUPLE_EXPR@85..87
+              L_PAREN@85..86 "("
+              R_PAREN@86..87 ")"
+            WHITESPACE@87..88 " "
+            BLOCK_EXPR@88..90
+              BLOCK@88..90
+                L_CURLY@88..89 "{"
+                R_CURLY@89..90 "}"
+        WHITESPACE@90..95 "\n    "
+        EXPR_STMT@95..97
+          BLOCK_EXPR@95..97
+            BLOCK@95..97
+              L_CURLY@95..96 "{"
+              R_CURLY@96..97 "}"
+        WHITESPACE@97..102 "\n    "
+        EXPR_STMT@102..104
+          BLOCK_EXPR@102..104
+            BLOCK@102..104
+              L_CURLY@102..103 "{"
+              R_CURLY@103..104 "}"
+        WHITESPACE@104..109 "\n    "
+        EXPR_STMT@109..152
+          MACRO_CALL@109..152
+            PATH@109..120
+              PATH_SEGMENT@109..120
+                NAME_REF@109..120
+                  IDENT@109..120 "macro_rules"
+            BANG@120..121 "!"
+            WHITESPACE@121..122 " "
+            NAME@122..126
+              IDENT@122..126 "test"
+            WHITESPACE@126..127 " "
+            TOKEN_TREE@127..152
+              L_CURLY@127..128 "{"
+              WHITESPACE@128..138 "\n         "
+              TOKEN_TREE@138..140
+                L_PAREN@138..139 "("
+                R_PAREN@139..140 ")"
+              WHITESPACE@140..141 " "
+              EQ@141..142 "="
+              R_ANGLE@142..143 ">"
+              WHITESPACE@143..144 " "
+              TOKEN_TREE@144..146
+                L_CURLY@144..145 "{"
+                R_CURLY@145..146 "}"
+              WHITESPACE@146..151 "\n    "
+              R_CURLY@151..152 "}"
+        WHITESPACE@152..157 "\n    "
+        MACRO_CALL@157..164
+          PATH@157..161
+            PATH_SEGMENT@157..161
+              NAME_REF@157..161
+                IDENT@157..161 "test"
+          BANG@161..162 "!"
+          TOKEN_TREE@162..164
+            L_CURLY@162..163 "{"
+            R_CURLY@163..164 "}"
+        WHITESPACE@164..165 "\n"
+        R_CURLY@165..166 "}"
+  WHITESPACE@166..167 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
index af9077270..80bda4ba7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
@@ -1,16 +1,16 @@
-SOURCE_FILE@[0; 20)
-  IMPL_DEF@[0; 19)
-    DEFAULT_KW@[0; 7) "default"
-    WHITESPACE@[7; 8) " "
-    IMPL_KW@[8; 12) "impl"
-    WHITESPACE@[12; 13) " "
-    PATH_TYPE@[13; 16)
-      PATH@[13; 16)
-        PATH_SEGMENT@[13; 16)
-          NAME_REF@[13; 16)
-            IDENT@[13; 16) "Foo"
-    WHITESPACE@[16; 17) " "
-    ITEM_LIST@[17; 19)
-      L_CURLY@[17; 18) "{"
-      R_CURLY@[18; 19) "}"
-  WHITESPACE@[19; 20) "\n"
+SOURCE_FILE@0..20
+  IMPL_DEF@0..19
+    DEFAULT_KW@0..7 "default"
+    WHITESPACE@7..8 " "
+    IMPL_KW@8..12 "impl"
+    WHITESPACE@12..13 " "
+    PATH_TYPE@13..16
+      PATH@13..16
+        PATH_SEGMENT@13..16
+          NAME_REF@13..16
+            IDENT@13..16 "Foo"
+    WHITESPACE@16..17 " "
+    ITEM_LIST@17..19
+      L_CURLY@17..18 "{"
+      R_CURLY@18..19 "}"
+  WHITESPACE@19..20 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
index 072dc9d16..a51fb5511 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
@@ -1,19 +1,19 @@
-SOURCE_FILE@[0; 25)
-  FN_DEF@[0; 24)
-    CONST_KW@[0; 5) "const"
-    WHITESPACE@[5; 6) " "
-    UNSAFE_KW@[6; 12) "unsafe"
-    WHITESPACE@[12; 13) " "
-    FN_KW@[13; 15) "fn"
-    WHITESPACE@[15; 16) " "
-    NAME@[16; 19)
-      IDENT@[16; 19) "foo"
-    PARAM_LIST@[19; 21)
-      L_PAREN@[19; 20) "("
-      R_PAREN@[20; 21) ")"
-    WHITESPACE@[21; 22) " "
-    BLOCK_EXPR@[22; 24)
-      BLOCK@[22; 24)
-        L_CURLY@[22; 23) "{"
-        R_CURLY@[23; 24) "}"
-  WHITESPACE@[24; 25) "\n"
+SOURCE_FILE@0..25
+  FN_DEF@0..24
+    CONST_KW@0..5 "const"
+    WHITESPACE@5..6 " "
+    UNSAFE_KW@6..12 "unsafe"
+    WHITESPACE@12..13 " "
+    FN_KW@13..15 "fn"
+    WHITESPACE@15..16 " "
+    NAME@16..19
+      IDENT@16..19 "foo"
+    PARAM_LIST@19..21
+      L_PAREN@19..20 "("
+      R_PAREN@20..21 ")"
+    WHITESPACE@21..22 " "
+    BLOCK_EXPR@22..24
+      BLOCK@22..24
+        L_CURLY@22..23 "{"
+        R_CURLY@23..24 "}"
+  WHITESPACE@24..25 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
index ed57a9eea..61b47bf35 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
@@ -1,103 +1,103 @@
-SOURCE_FILE@[0; 67)
-  FN_DEF@[0; 9)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 4)
-      IDENT@[3; 4) "a"
-    PARAM_LIST@[4; 6)
-      L_PAREN@[4; 5) "("
-      R_PAREN@[5; 6) ")"
-    WHITESPACE@[6; 7) " "
-    BLOCK_EXPR@[7; 9)
-      BLOCK@[7; 9)
-        L_CURLY@[7; 8) "{"
-        R_CURLY@[8; 9) "}"
-  WHITESPACE@[9; 10) "\n"
-  FN_DEF@[10; 25)
-    FN_KW@[10; 12) "fn"
-    WHITESPACE@[12; 13) " "
-    NAME@[13; 14)
-      IDENT@[13; 14) "b"
-    PARAM_LIST@[14; 22)
-      L_PAREN@[14; 15) "("
-      PARAM@[15; 21)
-        BIND_PAT@[15; 16)
-          NAME@[15; 16)
-            IDENT@[15; 16) "x"
-        COLON@[16; 17) ":"
-        WHITESPACE@[17; 18) " "
-        PATH_TYPE@[18; 21)
-          PATH@[18; 21)
-            PATH_SEGMENT@[18; 21)
-              NAME_REF@[18; 21)
-                IDENT@[18; 21) "i32"
-      R_PAREN@[21; 22) ")"
-    WHITESPACE@[22; 23) " "
-    BLOCK_EXPR@[23; 25)
-      BLOCK@[23; 25)
-        L_CURLY@[23; 24) "{"
-        R_CURLY@[24; 25) "}"
-  WHITESPACE@[25; 26) "\n"
-  FN_DEF@[26; 43)
-    FN_KW@[26; 28) "fn"
-    WHITESPACE@[28; 29) " "
-    NAME@[29; 30)
-      IDENT@[29; 30) "c"
-    PARAM_LIST@[30; 40)
-      L_PAREN@[30; 31) "("
-      PARAM@[31; 37)
-        BIND_PAT@[31; 32)
-          NAME@[31; 32)
-            IDENT@[31; 32) "x"
-        COLON@[32; 33) ":"
-        WHITESPACE@[33; 34) " "
-        PATH_TYPE@[34; 37)
-          PATH@[34; 37)
-            PATH_SEGMENT@[34; 37)
-              NAME_REF@[34; 37)
-                IDENT@[34; 37) "i32"
-      COMMA@[37; 38) ","
-      WHITESPACE@[38; 39) " "
-      R_PAREN@[39; 40) ")"
-    WHITESPACE@[40; 41) " "
-    BLOCK_EXPR@[41; 43)
-      BLOCK@[41; 43)
-        L_CURLY@[41; 42) "{"
-        R_CURLY@[42; 43) "}"
-  WHITESPACE@[43; 44) "\n"
-  FN_DEF@[44; 66)
-    FN_KW@[44; 46) "fn"
-    WHITESPACE@[46; 47) " "
-    NAME@[47; 48)
-      IDENT@[47; 48) "d"
-    PARAM_LIST@[48; 63)
-      L_PAREN@[48; 49) "("
-      PARAM@[49; 55)
-        BIND_PAT@[49; 50)
-          NAME@[49; 50)
-            IDENT@[49; 50) "x"
-        COLON@[50; 51) ":"
-        WHITESPACE@[51; 52) " "
-        PATH_TYPE@[52; 55)
-          PATH@[52; 55)
-            PATH_SEGMENT@[52; 55)
-              NAME_REF@[52; 55)
-                IDENT@[52; 55) "i32"
-      COMMA@[55; 56) ","
-      WHITESPACE@[56; 57) " "
-      PARAM@[57; 62)
-        BIND_PAT@[57; 58)
-          NAME@[57; 58)
-            IDENT@[57; 58) "y"
-        COLON@[58; 59) ":"
-        WHITESPACE@[59; 60) " "
-        TUPLE_TYPE@[60; 62)
-          L_PAREN@[60; 61) "("
-          R_PAREN@[61; 62) ")"
-      R_PAREN@[62; 63) ")"
-    WHITESPACE@[63; 64) " "
-    BLOCK_EXPR@[64; 66)
-      BLOCK@[64; 66)
-        L_CURLY@[64; 65) "{"
-        R_CURLY@[65; 66) "}"
-  WHITESPACE@[66; 67) "\n"
+SOURCE_FILE@0..67
+  FN_DEF@0..9
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..4
+      IDENT@3..4 "a"
+    PARAM_LIST@4..6
+      L_PAREN@4..5 "("
+      R_PAREN@5..6 ")"
+    WHITESPACE@6..7 " "
+    BLOCK_EXPR@7..9
+      BLOCK@7..9
+        L_CURLY@7..8 "{"
+        R_CURLY@8..9 "}"
+  WHITESPACE@9..10 "\n"
+  FN_DEF@10..25
+    FN_KW@10..12 "fn"
+    WHITESPACE@12..13 " "
+    NAME@13..14
+      IDENT@13..14 "b"
+    PARAM_LIST@14..22
+      L_PAREN@14..15 "("
+      PARAM@15..21
+        BIND_PAT@15..16
+          NAME@15..16
+            IDENT@15..16 "x"
+        COLON@16..17 ":"
+        WHITESPACE@17..18 " "
+        PATH_TYPE@18..21
+          PATH@18..21
+            PATH_SEGMENT@18..21
+              NAME_REF@18..21
+                IDENT@18..21 "i32"
+      R_PAREN@21..22 ")"
+    WHITESPACE@22..23 " "
+    BLOCK_EXPR@23..25
+      BLOCK@23..25
+        L_CURLY@23..24 "{"
+        R_CURLY@24..25 "}"
+  WHITESPACE@25..26 "\n"
+  FN_DEF@26..43
+    FN_KW@26..28 "fn"
+    WHITESPACE@28..29 " "
+    NAME@29..30
+      IDENT@29..30 "c"
+    PARAM_LIST@30..40
+      L_PAREN@30..31 "("
+      PARAM@31..37
+        BIND_PAT@31..32
+          NAME@31..32
+            IDENT@31..32 "x"
+        COLON@32..33 ":"
+        WHITESPACE@33..34 " "
+        PATH_TYPE@34..37
+          PATH@34..37
+            PATH_SEGMENT@34..37
+              NAME_REF@34..37
+                IDENT@34..37 "i32"
+      COMMA@37..38 ","
+      WHITESPACE@38..39 " "
+      R_PAREN@39..40 ")"
+    WHITESPACE@40..41 " "
+    BLOCK_EXPR@41..43
+      BLOCK@41..43
+        L_CURLY@41..42 "{"
+        R_CURLY@42..43 "}"
+  WHITESPACE@43..44 "\n"
+  FN_DEF@44..66
+    FN_KW@44..46 "fn"
+    WHITESPACE@46..47 " "
+    NAME@47..48
+      IDENT@47..48 "d"
+    PARAM_LIST@48..63
+      L_PAREN@48..49 "("
+      PARAM@49..55
+        BIND_PAT@49..50
+          NAME@49..50
+            IDENT@49..50 "x"
+        COLON@50..51 ":"
+        WHITESPACE@51..52 " "
+        PATH_TYPE@52..55
+          PATH@52..55
+            PATH_SEGMENT@52..55
+              NAME_REF@52..55
+                IDENT@52..55 "i32"
+      COMMA@55..56 ","
+      WHITESPACE@56..57 " "
+      PARAM@57..62
+        BIND_PAT@57..58
+          NAME@57..58
+            IDENT@57..58 "y"
+        COLON@58..59 ":"
+        WHITESPACE@59..60 " "
+        TUPLE_TYPE@60..62
+          L_PAREN@60..61 "("
+          R_PAREN@61..62 ")"
+      R_PAREN@62..63 ")"
+    WHITESPACE@63..64 " "
+    BLOCK_EXPR@64..66
+      BLOCK@64..66
+        L_CURLY@64..65 "{"
+        R_CURLY@65..66 "}"
+  WHITESPACE@66..67 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
index d25f087a5..89d435d1f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
@@ -1,36 +1,36 @@
-SOURCE_FILE@[0; 33)
-  FN_DEF@[0; 32)
-    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; 32)
-      BLOCK@[9; 32)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 30)
-          FOR_EXPR@[15; 29)
-            FOR_KW@[15; 18) "for"
-            WHITESPACE@[18; 19) " "
-            BIND_PAT@[19; 20)
-              NAME@[19; 20)
-                IDENT@[19; 20) "x"
-            WHITESPACE@[20; 21) " "
-            IN_KW@[21; 23) "in"
-            WHITESPACE@[23; 24) " "
-            ARRAY_EXPR@[24; 26)
-              L_BRACK@[24; 25) "["
-              R_BRACK@[25; 26) "]"
-            WHITESPACE@[26; 27) " "
-            BLOCK_EXPR@[27; 29)
-              BLOCK@[27; 29)
-                L_CURLY@[27; 28) "{"
-                R_CURLY@[28; 29) "}"
-          SEMICOLON@[29; 30) ";"
-        WHITESPACE@[30; 31) "\n"
-        R_CURLY@[31; 32) "}"
-  WHITESPACE@[32; 33) "\n"
+SOURCE_FILE@0..33
+  FN_DEF@0..32
+    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..32
+      BLOCK@9..32
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..30
+          FOR_EXPR@15..29
+            FOR_KW@15..18 "for"
+            WHITESPACE@18..19 " "
+            BIND_PAT@19..20
+              NAME@19..20
+                IDENT@19..20 "x"
+            WHITESPACE@20..21 " "
+            IN_KW@21..23 "in"
+            WHITESPACE@23..24 " "
+            ARRAY_EXPR@24..26
+              L_BRACK@24..25 "["
+              R_BRACK@25..26 "]"
+            WHITESPACE@26..27 " "
+            BLOCK_EXPR@27..29
+              BLOCK@27..29
+                L_CURLY@27..28 "{"
+                R_CURLY@28..29 "}"
+          SEMICOLON@29..30 ";"
+        WHITESPACE@30..31 "\n"
+        R_CURLY@31..32 "}"
+  WHITESPACE@32..33 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
index b7979fbf5..57b4d0c4f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
@@ -1,17 +1,17 @@
-SOURCE_FILE@[0; 19)
-  FN_DEF@[0; 18)
-    UNSAFE_KW@[0; 6) "unsafe"
-    WHITESPACE@[6; 7) " "
-    FN_KW@[7; 9) "fn"
-    WHITESPACE@[9; 10) " "
-    NAME@[10; 13)
-      IDENT@[10; 13) "foo"
-    PARAM_LIST@[13; 15)
-      L_PAREN@[13; 14) "("
-      R_PAREN@[14; 15) ")"
-    WHITESPACE@[15; 16) " "
-    BLOCK_EXPR@[16; 18)
-      BLOCK@[16; 18)
-        L_CURLY@[16; 17) "{"
-        R_CURLY@[17; 18) "}"
-  WHITESPACE@[18; 19) "\n"
+SOURCE_FILE@0..19
+  FN_DEF@0..18
+    UNSAFE_KW@0..6 "unsafe"
+    WHITESPACE@6..7 " "
+    FN_KW@7..9 "fn"
+    WHITESPACE@9..10 " "
+    NAME@10..13
+      IDENT@10..13 "foo"
+    PARAM_LIST@13..15
+      L_PAREN@13..14 "("
+      R_PAREN@14..15 ")"
+    WHITESPACE@15..16 " "
+    BLOCK_EXPR@16..18
+      BLOCK@16..18
+        L_CURLY@16..17 "{"
+        R_CURLY@17..18 "}"
+  WHITESPACE@18..19 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index fcd099de9..ed6f6f326 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
@@ -1,133 +1,133 @@
-SOURCE_FILE@[0; 119)
-  FN_DEF@[0; 118)
-    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; 118)
-      BLOCK@[9; 118)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 29)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          RECORD_PAT@[19; 23)
-            PATH@[19; 20)
-              PATH_SEGMENT@[19; 20)
-                NAME_REF@[19; 20)
-                  IDENT@[19; 20) "S"
-            WHITESPACE@[20; 21) " "
-            RECORD_FIELD_PAT_LIST@[21; 23)
-              L_CURLY@[21; 22) "{"
-              R_CURLY@[22; 23) "}"
-          WHITESPACE@[23; 24) " "
-          EQ@[24; 25) "="
-          WHITESPACE@[25; 26) " "
-          TUPLE_EXPR@[26; 28)
-            L_PAREN@[26; 27) "("
-            R_PAREN@[27; 28) ")"
-          SEMICOLON@[28; 29) ";"
-        WHITESPACE@[29; 34) "\n    "
-        LET_STMT@[34; 62)
-          LET_KW@[34; 37) "let"
-          WHITESPACE@[37; 38) " "
-          RECORD_PAT@[38; 56)
-            PATH@[38; 39)
-              PATH_SEGMENT@[38; 39)
-                NAME_REF@[38; 39)
-                  IDENT@[38; 39) "S"
-            WHITESPACE@[39; 40) " "
-            RECORD_FIELD_PAT_LIST@[40; 56)
-              L_CURLY@[40; 41) "{"
-              WHITESPACE@[41; 42) " "
-              RECORD_FIELD_PAT@[42; 43)
-                BIND_PAT@[42; 43)
-                  NAME@[42; 43)
-                    IDENT@[42; 43) "f"
-              COMMA@[43; 44) ","
-              WHITESPACE@[44; 45) " "
-              RECORD_FIELD_PAT@[45; 54)
-                BIND_PAT@[45; 54)
-                  REF_KW@[45; 48) "ref"
-                  WHITESPACE@[48; 49) " "
-                  MUT_KW@[49; 52) "mut"
-                  WHITESPACE@[52; 53) " "
-                  NAME@[53; 54)
-                    IDENT@[53; 54) "g"
-              WHITESPACE@[54; 55) " "
-              R_CURLY@[55; 56) "}"
-          WHITESPACE@[56; 57) " "
-          EQ@[57; 58) "="
-          WHITESPACE@[58; 59) " "
-          TUPLE_EXPR@[59; 61)
-            L_PAREN@[59; 60) "("
-            R_PAREN@[60; 61) ")"
-          SEMICOLON@[61; 62) ";"
-        WHITESPACE@[62; 67) "\n    "
-        LET_STMT@[67; 90)
-          LET_KW@[67; 70) "let"
-          WHITESPACE@[70; 71) " "
-          RECORD_PAT@[71; 84)
-            PATH@[71; 72)
-              PATH_SEGMENT@[71; 72)
-                NAME_REF@[71; 72)
-                  IDENT@[71; 72) "S"
-            WHITESPACE@[72; 73) " "
-            RECORD_FIELD_PAT_LIST@[73; 84)
-              L_CURLY@[73; 74) "{"
-              WHITESPACE@[74; 75) " "
-              RECORD_FIELD_PAT@[75; 79)
-                NAME_REF@[75; 76)
-                  IDENT@[75; 76) "h"
-                COLON@[76; 77) ":"
-                WHITESPACE@[77; 78) " "
-                PLACEHOLDER_PAT@[78; 79)
-                  UNDERSCORE@[78; 79) "_"
-              COMMA@[79; 80) ","
-              WHITESPACE@[80; 81) " "
-              DOT2@[81; 83) ".."
-              R_CURLY@[83; 84) "}"
-          WHITESPACE@[84; 85) " "
-          EQ@[85; 86) "="
-          WHITESPACE@[86; 87) " "
-          TUPLE_EXPR@[87; 89)
-            L_PAREN@[87; 88) "("
-            R_PAREN@[88; 89) ")"
-          SEMICOLON@[89; 90) ";"
-        WHITESPACE@[90; 95) "\n    "
-        LET_STMT@[95; 116)
-          LET_KW@[95; 98) "let"
-          WHITESPACE@[98; 99) " "
-          RECORD_PAT@[99; 110)
-            PATH@[99; 100)
-              PATH_SEGMENT@[99; 100)
-                NAME_REF@[99; 100)
-                  IDENT@[99; 100) "S"
-            WHITESPACE@[100; 101) " "
-            RECORD_FIELD_PAT_LIST@[101; 110)
-              L_CURLY@[101; 102) "{"
-              WHITESPACE@[102; 103) " "
-              RECORD_FIELD_PAT@[103; 107)
-                NAME_REF@[103; 104)
-                  IDENT@[103; 104) "h"
-                COLON@[104; 105) ":"
-                WHITESPACE@[105; 106) " "
-                PLACEHOLDER_PAT@[106; 107)
-                  UNDERSCORE@[106; 107) "_"
-              COMMA@[107; 108) ","
-              WHITESPACE@[108; 109) " "
-              R_CURLY@[109; 110) "}"
-          WHITESPACE@[110; 111) " "
-          EQ@[111; 112) "="
-          WHITESPACE@[112; 113) " "
-          TUPLE_EXPR@[113; 115)
-            L_PAREN@[113; 114) "("
-            R_PAREN@[114; 115) ")"
-          SEMICOLON@[115; 116) ";"
-        WHITESPACE@[116; 117) "\n"
-        R_CURLY@[117; 118) "}"
-  WHITESPACE@[118; 119) "\n"
+SOURCE_FILE@0..119
+  FN_DEF@0..118
+    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..118
+      BLOCK@9..118
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..29
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          RECORD_PAT@19..23
+            PATH@19..20
+              PATH_SEGMENT@19..20
+                NAME_REF@19..20
+                  IDENT@19..20 "S"
+            WHITESPACE@20..21 " "
+            RECORD_FIELD_PAT_LIST@21..23
+              L_CURLY@21..22 "{"
+              R_CURLY@22..23 "}"
+          WHITESPACE@23..24 " "
+          EQ@24..25 "="
+          WHITESPACE@25..26 " "
+          TUPLE_EXPR@26..28
+            L_PAREN@26..27 "("
+            R_PAREN@27..28 ")"
+          SEMICOLON@28..29 ";"
+        WHITESPACE@29..34 "\n    "
+        LET_STMT@34..62
+          LET_KW@34..37 "let"
+          WHITESPACE@37..38 " "
+          RECORD_PAT@38..56
+            PATH@38..39
+              PATH_SEGMENT@38..39
+                NAME_REF@38..39
+                  IDENT@38..39 "S"
+            WHITESPACE@39..40 " "
+            RECORD_FIELD_PAT_LIST@40..56
+              L_CURLY@40..41 "{"
+              WHITESPACE@41..42 " "
+              RECORD_FIELD_PAT@42..43
+                BIND_PAT@42..43
+                  NAME@42..43
+                    IDENT@42..43 "f"
+              COMMA@43..44 ","
+              WHITESPACE@44..45 " "
+              RECORD_FIELD_PAT@45..54
+                BIND_PAT@45..54
+                  REF_KW@45..48 "ref"
+                  WHITESPACE@48..49 " "
+                  MUT_KW@49..52 "mut"
+                  WHITESPACE@52..53 " "
+                  NAME@53..54
+                    IDENT@53..54 "g"
+              WHITESPACE@54..55 " "
+              R_CURLY@55..56 "}"
+          WHITESPACE@56..57 " "
+          EQ@57..58 "="
+          WHITESPACE@58..59 " "
+          TUPLE_EXPR@59..61
+            L_PAREN@59..60 "("
+            R_PAREN@60..61 ")"
+          SEMICOLON@61..62 ";"
+        WHITESPACE@62..67 "\n    "
+        LET_STMT@67..90
+          LET_KW@67..70 "let"
+          WHITESPACE@70..71 " "
+          RECORD_PAT@71..84
+            PATH@71..72
+              PATH_SEGMENT@71..72
+                NAME_REF@71..72
+                  IDENT@71..72 "S"
+            WHITESPACE@72..73 " "
+            RECORD_FIELD_PAT_LIST@73..84
+              L_CURLY@73..74 "{"
+              WHITESPACE@74..75 " "
+              RECORD_FIELD_PAT@75..79
+                NAME_REF@75..76
+                  IDENT@75..76 "h"
+                COLON@76..77 ":"
+                WHITESPACE@77..78 " "
+                PLACEHOLDER_PAT@78..79
+                  UNDERSCORE@78..79 "_"
+              COMMA@79..80 ","
+              WHITESPACE@80..81 " "
+              DOT2@81..83 ".."
+              R_CURLY@83..84 "}"
+          WHITESPACE@84..85 " "
+          EQ@85..86 "="
+          WHITESPACE@86..87 " "
+          TUPLE_EXPR@87..89
+            L_PAREN@87..88 "("
+            R_PAREN@88..89 ")"
+          SEMICOLON@89..90 ";"
+        WHITESPACE@90..95 "\n    "
+        LET_STMT@95..116
+          LET_KW@95..98 "let"
+          WHITESPACE@98..99 " "
+          RECORD_PAT@99..110
+            PATH@99..100
+              PATH_SEGMENT@99..100
+                NAME_REF@99..100
+                  IDENT@99..100 "S"
+            WHITESPACE@100..101 " "
+            RECORD_FIELD_PAT_LIST@101..110
+              L_CURLY@101..102 "{"
+              WHITESPACE@102..103 " "
+              RECORD_FIELD_PAT@103..107
+                NAME_REF@103..104
+                  IDENT@103..104 "h"
+                COLON@104..105 ":"
+                WHITESPACE@105..106 " "
+                PLACEHOLDER_PAT@106..107
+                  UNDERSCORE@106..107 "_"
+              COMMA@107..108 ","
+              WHITESPACE@108..109 " "
+              R_CURLY@109..110 "}"
+          WHITESPACE@110..111 " "
+          EQ@111..112 "="
+          WHITESPACE@112..113 " "
+          TUPLE_EXPR@113..115
+            L_PAREN@113..114 "("
+            R_PAREN@114..115 ")"
+          SEMICOLON@115..116 ";"
+        WHITESPACE@116..117 "\n"
+        R_CURLY@117..118 "}"
+  WHITESPACE@118..119 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
index 60fbf2771..461c61914 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
@@ -1,55 +1,55 @@
-SOURCE_FILE@[0; 55)
-  FN_DEF@[0; 54)
-    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; 54)
-      BLOCK@[9; 54)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 18)
-          ARRAY_EXPR@[15; 17)
-            L_BRACK@[15; 16) "["
-            R_BRACK@[16; 17) "]"
-          SEMICOLON@[17; 18) ";"
-        WHITESPACE@[18; 23) "\n    "
-        EXPR_STMT@[23; 27)
-          ARRAY_EXPR@[23; 26)
-            L_BRACK@[23; 24) "["
-            LITERAL@[24; 25)
-              INT_NUMBER@[24; 25) "1"
-            R_BRACK@[25; 26) "]"
-          SEMICOLON@[26; 27) ";"
-        WHITESPACE@[27; 32) "\n    "
-        EXPR_STMT@[32; 40)
-          ARRAY_EXPR@[32; 39)
-            L_BRACK@[32; 33) "["
-            LITERAL@[33; 34)
-              INT_NUMBER@[33; 34) "1"
-            COMMA@[34; 35) ","
-            WHITESPACE@[35; 36) " "
-            LITERAL@[36; 37)
-              INT_NUMBER@[36; 37) "2"
-            COMMA@[37; 38) ","
-            R_BRACK@[38; 39) "]"
-          SEMICOLON@[39; 40) ";"
-        WHITESPACE@[40; 45) "\n    "
-        EXPR_STMT@[45; 52)
-          ARRAY_EXPR@[45; 51)
-            L_BRACK@[45; 46) "["
-            LITERAL@[46; 47)
-              INT_NUMBER@[46; 47) "1"
-            SEMICOLON@[47; 48) ";"
-            WHITESPACE@[48; 49) " "
-            LITERAL@[49; 50)
-              INT_NUMBER@[49; 50) "2"
-            R_BRACK@[50; 51) "]"
-          SEMICOLON@[51; 52) ";"
-        WHITESPACE@[52; 53) "\n"
-        R_CURLY@[53; 54) "}"
-  WHITESPACE@[54; 55) "\n"
+SOURCE_FILE@0..55
+  FN_DEF@0..54
+    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..54
+      BLOCK@9..54
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..18
+          ARRAY_EXPR@15..17
+            L_BRACK@15..16 "["
+            R_BRACK@16..17 "]"
+          SEMICOLON@17..18 ";"
+        WHITESPACE@18..23 "\n    "
+        EXPR_STMT@23..27
+          ARRAY_EXPR@23..26
+            L_BRACK@23..24 "["
+            LITERAL@24..25
+              INT_NUMBER@24..25 "1"
+            R_BRACK@25..26 "]"
+          SEMICOLON@26..27 ";"
+        WHITESPACE@27..32 "\n    "
+        EXPR_STMT@32..40
+          ARRAY_EXPR@32..39
+            L_BRACK@32..33 "["
+            LITERAL@33..34
+              INT_NUMBER@33..34 "1"
+            COMMA@34..35 ","
+            WHITESPACE@35..36 " "
+            LITERAL@36..37
+              INT_NUMBER@36..37 "2"
+            COMMA@37..38 ","
+            R_BRACK@38..39 "]"
+          SEMICOLON@39..40 ";"
+        WHITESPACE@40..45 "\n    "
+        EXPR_STMT@45..52
+          ARRAY_EXPR@45..51
+            L_BRACK@45..46 "["
+            LITERAL@46..47
+              INT_NUMBER@46..47 "1"
+            SEMICOLON@47..48 ";"
+            WHITESPACE@48..49 " "
+            LITERAL@49..50
+              INT_NUMBER@49..50 "2"
+            R_BRACK@50..51 "]"
+          SEMICOLON@51..52 ";"
+        WHITESPACE@52..53 "\n"
+        R_CURLY@53..54 "}"
+  WHITESPACE@54..55 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
index d65c75c65..e3c4cfeb3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
@@ -1,41 +1,41 @@
-SOURCE_FILE@[0; 29)
-  TYPE_ALIAS_DEF@[0; 28)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "F"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    PATH_TYPE@[9; 27)
-      PATH@[9; 27)
-        PATH_SEGMENT@[9; 27)
-          NAME_REF@[9; 12)
-            IDENT@[9; 12) "Box"
-          TYPE_ARG_LIST@[12; 27)
-            L_ANGLE@[12; 13) "<"
-            TYPE_ARG@[13; 26)
-              PATH_TYPE@[13; 26)
-                PATH@[13; 26)
-                  PATH_SEGMENT@[13; 26)
-                    NAME_REF@[13; 15)
-                      IDENT@[13; 15) "Fn"
-                    PARAM_LIST@[15; 20)
-                      L_PAREN@[15; 16) "("
-                      PARAM@[16; 19)
-                        PATH_TYPE@[16; 19)
-                          PATH@[16; 19)
-                            PATH_SEGMENT@[16; 19)
-                              NAME_REF@[16; 19)
-                                IDENT@[16; 19) "i32"
-                      R_PAREN@[19; 20) ")"
-                    WHITESPACE@[20; 21) " "
-                    RET_TYPE@[21; 26)
-                      THIN_ARROW@[21; 23) "->"
-                      WHITESPACE@[23; 24) " "
-                      TUPLE_TYPE@[24; 26)
-                        L_PAREN@[24; 25) "("
-                        R_PAREN@[25; 26) ")"
-            R_ANGLE@[26; 27) ">"
-    SEMICOLON@[27; 28) ";"
-  WHITESPACE@[28; 29) "\n"
+SOURCE_FILE@0..29
+  TYPE_ALIAS_DEF@0..28
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "F"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..27
+      PATH@9..27
+        PATH_SEGMENT@9..27
+          NAME_REF@9..12
+            IDENT@9..12 "Box"
+          TYPE_ARG_LIST@12..27
+            L_ANGLE@12..13 "<"
+            TYPE_ARG@13..26
+              PATH_TYPE@13..26
+                PATH@13..26
+                  PATH_SEGMENT@13..26
+                    NAME_REF@13..15
+                      IDENT@13..15 "Fn"
+                    PARAM_LIST@15..20
+                      L_PAREN@15..16 "("
+                      PARAM@16..19
+                        PATH_TYPE@16..19
+                          PATH@16..19
+                            PATH_SEGMENT@16..19
+                              NAME_REF@16..19
+                                IDENT@16..19 "i32"
+                      R_PAREN@19..20 ")"
+                    WHITESPACE@20..21 " "
+                    RET_TYPE@21..26
+                      THIN_ARROW@21..23 "->"
+                      WHITESPACE@23..24 " "
+                      TUPLE_TYPE@24..26
+                        L_PAREN@24..25 "("
+                        R_PAREN@25..26 ")"
+            R_ANGLE@26..27 ">"
+    SEMICOLON@27..28 ";"
+  WHITESPACE@28..29 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
index 5635cba9b..8b2323cf2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
@@ -1,43 +1,43 @@
-SOURCE_FILE@[0; 52)
-  FN_DEF@[0; 51)
-    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; 51)
-      BLOCK@[9; 51)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 18)
-          BLOCK_EXPR@[15; 17)
-            BLOCK@[15; 17)
-              L_CURLY@[15; 16) "{"
-              R_CURLY@[16; 17) "}"
-          SEMICOLON@[17; 18) ";"
-        WHITESPACE@[18; 23) "\n    "
-        EXPR_STMT@[23; 33)
-          BLOCK_EXPR@[23; 32)
-            UNSAFE_KW@[23; 29) "unsafe"
-            WHITESPACE@[29; 30) " "
-            BLOCK@[30; 32)
-              L_CURLY@[30; 31) "{"
-              R_CURLY@[31; 32) "}"
-          SEMICOLON@[32; 33) ";"
-        WHITESPACE@[33; 38) "\n    "
-        EXPR_STMT@[38; 49)
-          BLOCK_EXPR@[38; 48)
-            LABEL@[38; 45)
-              LIFETIME@[38; 44) "\'label"
-              COLON@[44; 45) ":"
-            WHITESPACE@[45; 46) " "
-            BLOCK@[46; 48)
-              L_CURLY@[46; 47) "{"
-              R_CURLY@[47; 48) "}"
-          SEMICOLON@[48; 49) ";"
-        WHITESPACE@[49; 50) "\n"
-        R_CURLY@[50; 51) "}"
-  WHITESPACE@[51; 52) "\n"
+SOURCE_FILE@0..52
+  FN_DEF@0..51
+    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..51
+      BLOCK@9..51
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..18
+          BLOCK_EXPR@15..17
+            BLOCK@15..17
+              L_CURLY@15..16 "{"
+              R_CURLY@16..17 "}"
+          SEMICOLON@17..18 ";"
+        WHITESPACE@18..23 "\n    "
+        EXPR_STMT@23..33
+          BLOCK_EXPR@23..32
+            UNSAFE_KW@23..29 "unsafe"
+            WHITESPACE@29..30 " "
+            BLOCK@30..32
+              L_CURLY@30..31 "{"
+              R_CURLY@31..32 "}"
+          SEMICOLON@32..33 ";"
+        WHITESPACE@33..38 "\n    "
+        EXPR_STMT@38..49
+          BLOCK_EXPR@38..48
+            LABEL@38..45
+              LIFETIME@38..44 "\'label"
+              COLON@44..45 ":"
+            WHITESPACE@45..46 " "
+            BLOCK@46..48
+              L_CURLY@46..47 "{"
+              R_CURLY@47..48 "}"
+          SEMICOLON@48..49 ";"
+        WHITESPACE@49..50 "\n"
+        R_CURLY@50..51 "}"
+  WHITESPACE@51..52 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index 157dfcdb8..73c314e07 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
@@ -1,140 +1,140 @@
-SOURCE_FILE@[0; 134)
-  FN_DEF@[0; 133)
-    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; 133)
-      BLOCK@[9; 133)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 21)
-          LAMBDA_EXPR@[15; 20)
-            PARAM_LIST@[15; 17)
-              PIPE@[15; 16) "|"
-              PIPE@[16; 17) "|"
-            WHITESPACE@[17; 18) " "
-            TUPLE_EXPR@[18; 20)
-              L_PAREN@[18; 19) "("
-              R_PAREN@[19; 20) ")"
-          SEMICOLON@[20; 21) ";"
-        WHITESPACE@[21; 26) "\n    "
-        EXPR_STMT@[26; 43)
-          LAMBDA_EXPR@[26; 42)
-            PARAM_LIST@[26; 28)
-              PIPE@[26; 27) "|"
-              PIPE@[27; 28) "|"
-            WHITESPACE@[28; 29) " "
-            RET_TYPE@[29; 35)
-              THIN_ARROW@[29; 31) "->"
-              WHITESPACE@[31; 32) " "
-              PATH_TYPE@[32; 35)
-                PATH@[32; 35)
-                  PATH_SEGMENT@[32; 35)
-                    NAME_REF@[32; 35)
-                      IDENT@[32; 35) "i32"
-            WHITESPACE@[35; 36) " "
-            BLOCK_EXPR@[36; 42)
-              BLOCK@[36; 42)
-                L_CURLY@[36; 37) "{"
-                WHITESPACE@[37; 38) " "
-                LITERAL@[38; 40)
-                  INT_NUMBER@[38; 40) "92"
-                WHITESPACE@[40; 41) " "
-                R_CURLY@[41; 42) "}"
-          SEMICOLON@[42; 43) ";"
-        WHITESPACE@[43; 48) "\n    "
-        EXPR_STMT@[48; 54)
-          LAMBDA_EXPR@[48; 53)
-            PARAM_LIST@[48; 51)
-              PIPE@[48; 49) "|"
-              PARAM@[49; 50)
-                BIND_PAT@[49; 50)
-                  NAME@[49; 50)
-                    IDENT@[49; 50) "x"
-              PIPE@[50; 51) "|"
-            WHITESPACE@[51; 52) " "
-            PATH_EXPR@[52; 53)
-              PATH@[52; 53)
-                PATH_SEGMENT@[52; 53)
-                  NAME_REF@[52; 53)
-                    IDENT@[52; 53) "x"
-          SEMICOLON@[53; 54) ";"
-        WHITESPACE@[54; 59) "\n    "
-        EXPR_STMT@[59; 76)
-          LAMBDA_EXPR@[59; 75)
-            MOVE_KW@[59; 63) "move"
-            WHITESPACE@[63; 64) " "
-            PARAM_LIST@[64; 73)
-              PIPE@[64; 65) "|"
-              PARAM@[65; 71)
-                BIND_PAT@[65; 66)
-                  NAME@[65; 66)
-                    IDENT@[65; 66) "x"
-                COLON@[66; 67) ":"
-                WHITESPACE@[67; 68) " "
-                PATH_TYPE@[68; 71)
-                  PATH@[68; 71)
-                    PATH_SEGMENT@[68; 71)
-                      NAME_REF@[68; 71)
-                        IDENT@[68; 71) "i32"
-              COMMA@[71; 72) ","
-              PIPE@[72; 73) "|"
-            WHITESPACE@[73; 74) " "
-            PATH_EXPR@[74; 75)
-              PATH@[74; 75)
-                PATH_SEGMENT@[74; 75)
-                  NAME_REF@[74; 75)
-                    IDENT@[74; 75) "x"
-          SEMICOLON@[75; 76) ";"
-        WHITESPACE@[76; 81) "\n    "
-        EXPR_STMT@[81; 93)
-          LAMBDA_EXPR@[81; 92)
-            ASYNC_KW@[81; 86) "async"
-            WHITESPACE@[86; 87) " "
-            PARAM_LIST@[87; 89)
-              PIPE@[87; 88) "|"
-              PIPE@[88; 89) "|"
-            WHITESPACE@[89; 90) " "
-            BLOCK_EXPR@[90; 92)
-              BLOCK@[90; 92)
-                L_CURLY@[90; 91) "{"
-                R_CURLY@[91; 92) "}"
-          SEMICOLON@[92; 93) ";"
-        WHITESPACE@[93; 98) "\n    "
-        EXPR_STMT@[98; 109)
-          LAMBDA_EXPR@[98; 108)
-            MOVE_KW@[98; 102) "move"
-            WHITESPACE@[102; 103) " "
-            PARAM_LIST@[103; 105)
-              PIPE@[103; 104) "|"
-              PIPE@[104; 105) "|"
-            WHITESPACE@[105; 106) " "
-            BLOCK_EXPR@[106; 108)
-              BLOCK@[106; 108)
-                L_CURLY@[106; 107) "{"
-                R_CURLY@[107; 108) "}"
-          SEMICOLON@[108; 109) ";"
-        WHITESPACE@[109; 114) "\n    "
-        EXPR_STMT@[114; 131)
-          LAMBDA_EXPR@[114; 130)
-            ASYNC_KW@[114; 119) "async"
-            WHITESPACE@[119; 120) " "
-            MOVE_KW@[120; 124) "move"
-            WHITESPACE@[124; 125) " "
-            PARAM_LIST@[125; 127)
-              PIPE@[125; 126) "|"
-              PIPE@[126; 127) "|"
-            WHITESPACE@[127; 128) " "
-            BLOCK_EXPR@[128; 130)
-              BLOCK@[128; 130)
-                L_CURLY@[128; 129) "{"
-                R_CURLY@[129; 130) "}"
-          SEMICOLON@[130; 131) ";"
-        WHITESPACE@[131; 132) "\n"
-        R_CURLY@[132; 133) "}"
-  WHITESPACE@[133; 134) "\n"
+SOURCE_FILE@0..134
+  FN_DEF@0..133
+    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..133
+      BLOCK@9..133
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..21
+          LAMBDA_EXPR@15..20
+            PARAM_LIST@15..17
+              PIPE@15..16 "|"
+              PIPE@16..17 "|"
+            WHITESPACE@17..18 " "
+            TUPLE_EXPR@18..20
+              L_PAREN@18..19 "("
+              R_PAREN@19..20 ")"
+          SEMICOLON@20..21 ";"
+        WHITESPACE@21..26 "\n    "
+        EXPR_STMT@26..43
+          LAMBDA_EXPR@26..42
+            PARAM_LIST@26..28
+              PIPE@26..27 "|"
+              PIPE@27..28 "|"
+            WHITESPACE@28..29 " "
+            RET_TYPE@29..35
+              THIN_ARROW@29..31 "->"
+              WHITESPACE@31..32 " "
+              PATH_TYPE@32..35
+                PATH@32..35
+                  PATH_SEGMENT@32..35
+                    NAME_REF@32..35
+                      IDENT@32..35 "i32"
+            WHITESPACE@35..36 " "
+            BLOCK_EXPR@36..42
+              BLOCK@36..42
+                L_CURLY@36..37 "{"
+                WHITESPACE@37..38 " "
+                LITERAL@38..40
+                  INT_NUMBER@38..40 "92"
+                WHITESPACE@40..41 " "
+                R_CURLY@41..42 "}"
+          SEMICOLON@42..43 ";"
+        WHITESPACE@43..48 "\n    "
+        EXPR_STMT@48..54
+          LAMBDA_EXPR@48..53
+            PARAM_LIST@48..51
+              PIPE@48..49 "|"
+              PARAM@49..50
+                BIND_PAT@49..50
+                  NAME@49..50
+                    IDENT@49..50 "x"
+              PIPE@50..51 "|"
+            WHITESPACE@51..52 " "
+            PATH_EXPR@52..53
+              PATH@52..53
+                PATH_SEGMENT@52..53
+                  NAME_REF@52..53
+                    IDENT@52..53 "x"
+          SEMICOLON@53..54 ";"
+        WHITESPACE@54..59 "\n    "
+        EXPR_STMT@59..76
+          LAMBDA_EXPR@59..75
+            MOVE_KW@59..63 "move"
+            WHITESPACE@63..64 " "
+            PARAM_LIST@64..73
+              PIPE@64..65 "|"
+              PARAM@65..71
+                BIND_PAT@65..66
+                  NAME@65..66
+                    IDENT@65..66 "x"
+                COLON@66..67 ":"
+                WHITESPACE@67..68 " "
+                PATH_TYPE@68..71
+                  PATH@68..71
+                    PATH_SEGMENT@68..71
+                      NAME_REF@68..71
+                        IDENT@68..71 "i32"
+              COMMA@71..72 ","
+              PIPE@72..73 "|"
+            WHITESPACE@73..74 " "
+            PATH_EXPR@74..75
+              PATH@74..75
+                PATH_SEGMENT@74..75
+                  NAME_REF@74..75
+                    IDENT@74..75 "x"
+          SEMICOLON@75..76 ";"
+        WHITESPACE@76..81 "\n    "
+        EXPR_STMT@81..93
+          LAMBDA_EXPR@81..92
+            ASYNC_KW@81..86 "async"
+            WHITESPACE@86..87 " "
+            PARAM_LIST@87..89
+              PIPE@87..88 "|"
+              PIPE@88..89 "|"
+            WHITESPACE@89..90 " "
+            BLOCK_EXPR@90..92
+              BLOCK@90..92
+                L_CURLY@90..91 "{"
+                R_CURLY@91..92 "}"
+          SEMICOLON@92..93 ";"
+        WHITESPACE@93..98 "\n    "
+        EXPR_STMT@98..109
+          LAMBDA_EXPR@98..108
+            MOVE_KW@98..102 "move"
+            WHITESPACE@102..103 " "
+            PARAM_LIST@103..105
+              PIPE@103..104 "|"
+              PIPE@104..105 "|"
+            WHITESPACE@105..106 " "
+            BLOCK_EXPR@106..108
+              BLOCK@106..108
+                L_CURLY@106..107 "{"
+                R_CURLY@107..108 "}"
+          SEMICOLON@108..109 ";"
+        WHITESPACE@109..114 "\n    "
+        EXPR_STMT@114..131
+          LAMBDA_EXPR@114..130
+            ASYNC_KW@114..119 "async"
+            WHITESPACE@119..120 " "
+            MOVE_KW@120..124 "move"
+            WHITESPACE@124..125 " "
+            PARAM_LIST@125..127
+              PIPE@125..126 "|"
+              PIPE@126..127 "|"
+            WHITESPACE@127..128 " "
+            BLOCK_EXPR@128..130
+              BLOCK@128..130
+                L_CURLY@128..129 "{"
+                R_CURLY@129..130 "}"
+          SEMICOLON@130..131 ";"
+        WHITESPACE@131..132 "\n"
+        R_CURLY@132..133 "}"
+  WHITESPACE@133..134 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index cc813038c..5392b1a74 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -1,63 +1,63 @@
-SOURCE_FILE@[0; 49)
-  FN_DEF@[0; 48)
-    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; 48)
-      BLOCK@[9; 48)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 23)
-          METHOD_CALL_EXPR@[15; 22)
-            PATH_EXPR@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "x"
-            DOT@[16; 17) "."
-            NAME_REF@[17; 20)
-              IDENT@[17; 20) "foo"
-            ARG_LIST@[20; 22)
-              L_PAREN@[20; 21) "("
-              R_PAREN@[21; 22) ")"
-          SEMICOLON@[22; 23) ";"
-        WHITESPACE@[23; 28) "\n    "
-        EXPR_STMT@[28; 46)
-          METHOD_CALL_EXPR@[28; 45)
-            PATH_EXPR@[28; 29)
-              PATH@[28; 29)
-                PATH_SEGMENT@[28; 29)
-                  NAME_REF@[28; 29)
-                    IDENT@[28; 29) "y"
-            DOT@[29; 30) "."
-            NAME_REF@[30; 33)
-              IDENT@[30; 33) "bar"
-            TYPE_ARG_LIST@[33; 38)
-              COLON2@[33; 35) "::"
-              L_ANGLE@[35; 36) "<"
-              TYPE_ARG@[36; 37)
-                PATH_TYPE@[36; 37)
-                  PATH@[36; 37)
-                    PATH_SEGMENT@[36; 37)
-                      NAME_REF@[36; 37)
-                        IDENT@[36; 37) "T"
-              R_ANGLE@[37; 38) ">"
-            ARG_LIST@[38; 45)
-              L_PAREN@[38; 39) "("
-              LITERAL@[39; 40)
-                INT_NUMBER@[39; 40) "1"
-              COMMA@[40; 41) ","
-              WHITESPACE@[41; 42) " "
-              LITERAL@[42; 43)
-                INT_NUMBER@[42; 43) "2"
-              COMMA@[43; 44) ","
-              R_PAREN@[44; 45) ")"
-          SEMICOLON@[45; 46) ";"
-        WHITESPACE@[46; 47) "\n"
-        R_CURLY@[47; 48) "}"
-  WHITESPACE@[48; 49) "\n"
+SOURCE_FILE@0..49
+  FN_DEF@0..48
+    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..48
+      BLOCK@9..48
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..23
+          METHOD_CALL_EXPR@15..22
+            PATH_EXPR@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "x"
+            DOT@16..17 "."
+            NAME_REF@17..20
+              IDENT@17..20 "foo"
+            ARG_LIST@20..22
+              L_PAREN@20..21 "("
+              R_PAREN@21..22 ")"
+          SEMICOLON@22..23 ";"
+        WHITESPACE@23..28 "\n    "
+        EXPR_STMT@28..46
+          METHOD_CALL_EXPR@28..45
+            PATH_EXPR@28..29
+              PATH@28..29
+                PATH_SEGMENT@28..29
+                  NAME_REF@28..29
+                    IDENT@28..29 "y"
+            DOT@29..30 "."
+            NAME_REF@30..33
+              IDENT@30..33 "bar"
+            TYPE_ARG_LIST@33..38
+              COLON2@33..35 "::"
+              L_ANGLE@35..36 "<"
+              TYPE_ARG@36..37
+                PATH_TYPE@36..37
+                  PATH@36..37
+                    PATH_SEGMENT@36..37
+                      NAME_REF@36..37
+                        IDENT@36..37 "T"
+              R_ANGLE@37..38 ">"
+            ARG_LIST@38..45
+              L_PAREN@38..39 "("
+              LITERAL@39..40
+                INT_NUMBER@39..40 "1"
+              COMMA@40..41 ","
+              WHITESPACE@41..42 " "
+              LITERAL@42..43
+                INT_NUMBER@42..43 "2"
+              COMMA@43..44 ","
+              R_PAREN@44..45 ")"
+          SEMICOLON@45..46 ";"
+        WHITESPACE@46..47 "\n"
+        R_CURLY@47..48 "}"
+  WHITESPACE@48..49 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index 27c3f398e..54f18adac 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
@@ -1,39 +1,39 @@
-SOURCE_FILE@[0; 40)
-  FN_DEF@[0; 39)
-    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; 39)
-      BLOCK@[9; 39)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 18)
-          TUPLE_EXPR@[15; 17)
-            L_PAREN@[15; 16) "("
-            R_PAREN@[16; 17) ")"
-          SEMICOLON@[17; 18) ";"
-        WHITESPACE@[18; 23) "\n    "
-        EXPR_STMT@[23; 27)
-          PAREN_EXPR@[23; 26)
-            L_PAREN@[23; 24) "("
-            LITERAL@[24; 25)
-              INT_NUMBER@[24; 25) "1"
-            R_PAREN@[25; 26) ")"
-          SEMICOLON@[26; 27) ";"
-        WHITESPACE@[27; 32) "\n    "
-        EXPR_STMT@[32; 37)
-          TUPLE_EXPR@[32; 36)
-            L_PAREN@[32; 33) "("
-            LITERAL@[33; 34)
-              INT_NUMBER@[33; 34) "1"
-            COMMA@[34; 35) ","
-            R_PAREN@[35; 36) ")"
-          SEMICOLON@[36; 37) ";"
-        WHITESPACE@[37; 38) "\n"
-        R_CURLY@[38; 39) "}"
-  WHITESPACE@[39; 40) "\n"
+SOURCE_FILE@0..40
+  FN_DEF@0..39
+    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..39
+      BLOCK@9..39
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..18
+          TUPLE_EXPR@15..17
+            L_PAREN@15..16 "("
+            R_PAREN@16..17 ")"
+          SEMICOLON@17..18 ";"
+        WHITESPACE@18..23 "\n    "
+        EXPR_STMT@23..27
+          PAREN_EXPR@23..26
+            L_PAREN@23..24 "("
+            LITERAL@24..25
+              INT_NUMBER@24..25 "1"
+            R_PAREN@25..26 ")"
+          SEMICOLON@26..27 ";"
+        WHITESPACE@27..32 "\n    "
+        EXPR_STMT@32..37
+          TUPLE_EXPR@32..36
+            L_PAREN@32..33 "("
+            LITERAL@33..34
+              INT_NUMBER@33..34 "1"
+            COMMA@34..35 ","
+            R_PAREN@35..36 ")"
+          SEMICOLON@36..37 ";"
+        WHITESPACE@37..38 "\n"
+        R_CURLY@38..39 "}"
+  WHITESPACE@39..40 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
index 3376a90cb..6c9e45684 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
@@ -1,68 +1,68 @@
-SOURCE_FILE@[0; 74)
-  FN_DEF@[0; 73)
-    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; 73)
-      BLOCK@[9; 73)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 26)
-          LOOP_EXPR@[15; 26)
-            LABEL@[15; 18)
-              LIFETIME@[15; 17) "\'a"
-              COLON@[17; 18) ":"
-            WHITESPACE@[18; 19) " "
-            LOOP_KW@[19; 23) "loop"
-            WHITESPACE@[23; 24) " "
-            BLOCK_EXPR@[24; 26)
-              BLOCK@[24; 26)
-                L_CURLY@[24; 25) "{"
-                R_CURLY@[25; 26) "}"
-        WHITESPACE@[26; 31) "\n    "
-        EXPR_STMT@[31; 48)
-          WHILE_EXPR@[31; 48)
-            LABEL@[31; 34)
-              LIFETIME@[31; 33) "\'b"
-              COLON@[33; 34) ":"
-            WHITESPACE@[34; 35) " "
-            WHILE_KW@[35; 40) "while"
-            WHITESPACE@[40; 41) " "
-            CONDITION@[41; 45)
-              LITERAL@[41; 45)
-                TRUE_KW@[41; 45) "true"
-            WHITESPACE@[45; 46) " "
-            BLOCK_EXPR@[46; 48)
-              BLOCK@[46; 48)
-                L_CURLY@[46; 47) "{"
-                R_CURLY@[47; 48) "}"
-        WHITESPACE@[48; 53) "\n    "
-        FOR_EXPR@[53; 71)
-          LABEL@[53; 56)
-            LIFETIME@[53; 55) "\'c"
-            COLON@[55; 56) ":"
-          WHITESPACE@[56; 57) " "
-          FOR_KW@[57; 60) "for"
-          WHITESPACE@[60; 61) " "
-          BIND_PAT@[61; 62)
-            NAME@[61; 62)
-              IDENT@[61; 62) "x"
-          WHITESPACE@[62; 63) " "
-          IN_KW@[63; 65) "in"
-          WHITESPACE@[65; 66) " "
-          TUPLE_EXPR@[66; 68)
-            L_PAREN@[66; 67) "("
-            R_PAREN@[67; 68) ")"
-          WHITESPACE@[68; 69) " "
-          BLOCK_EXPR@[69; 71)
-            BLOCK@[69; 71)
-              L_CURLY@[69; 70) "{"
-              R_CURLY@[70; 71) "}"
-        WHITESPACE@[71; 72) "\n"
-        R_CURLY@[72; 73) "}"
-  WHITESPACE@[73; 74) "\n"
+SOURCE_FILE@0..74
+  FN_DEF@0..73
+    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..73
+      BLOCK@9..73
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..26
+          LOOP_EXPR@15..26
+            LABEL@15..18
+              LIFETIME@15..17 "\'a"
+              COLON@17..18 ":"
+            WHITESPACE@18..19 " "
+            LOOP_KW@19..23 "loop"
+            WHITESPACE@23..24 " "
+            BLOCK_EXPR@24..26
+              BLOCK@24..26
+                L_CURLY@24..25 "{"
+                R_CURLY@25..26 "}"
+        WHITESPACE@26..31 "\n    "
+        EXPR_STMT@31..48
+          WHILE_EXPR@31..48
+            LABEL@31..34
+              LIFETIME@31..33 "\'b"
+              COLON@33..34 ":"
+            WHITESPACE@34..35 " "
+            WHILE_KW@35..40 "while"
+            WHITESPACE@40..41 " "
+            CONDITION@41..45
+              LITERAL@41..45
+                TRUE_KW@41..45 "true"
+            WHITESPACE@45..46 " "
+            BLOCK_EXPR@46..48
+              BLOCK@46..48
+                L_CURLY@46..47 "{"
+                R_CURLY@47..48 "}"
+        WHITESPACE@48..53 "\n    "
+        FOR_EXPR@53..71
+          LABEL@53..56
+            LIFETIME@53..55 "\'c"
+            COLON@55..56 ":"
+          WHITESPACE@56..57 " "
+          FOR_KW@57..60 "for"
+          WHITESPACE@60..61 " "
+          BIND_PAT@61..62
+            NAME@61..62
+              IDENT@61..62 "x"
+          WHITESPACE@62..63 " "
+          IN_KW@63..65 "in"
+          WHITESPACE@65..66 " "
+          TUPLE_EXPR@66..68
+            L_PAREN@66..67 "("
+            R_PAREN@67..68 ")"
+          WHITESPACE@68..69 " "
+          BLOCK_EXPR@69..71
+            BLOCK@69..71
+              L_CURLY@69..70 "{"
+              R_CURLY@70..71 "}"
+        WHITESPACE@71..72 "\n"
+        R_CURLY@72..73 "}"
+  WHITESPACE@73..74 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
index d4f5737d5..015a7a7d2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
@@ -1,38 +1,38 @@
-SOURCE_FILE@[0; 154)
-  USE_ITEM@[0; 17)
-    USE_KW@[0; 3) "use"
-    WHITESPACE@[3; 4) " "
-    USE_TREE@[4; 16)
-      PATH@[4; 16)
-        PATH_SEGMENT@[4; 16)
-          COLON2@[4; 6) "::"
-          NAME_REF@[6; 16)
-            IDENT@[6; 16) "crate_name"
-    SEMICOLON@[16; 17) ";"
-  WHITESPACE@[17; 18) " "
-  COMMENT@[18; 45) "// Rust 2018 - All fl ..."
-  WHITESPACE@[45; 46) "\n"
-  USE_ITEM@[46; 61)
-    USE_KW@[46; 49) "use"
-    WHITESPACE@[49; 50) " "
-    USE_TREE@[50; 60)
-      PATH@[50; 60)
-        PATH_SEGMENT@[50; 60)
-          NAME_REF@[50; 60)
-            IDENT@[50; 60) "crate_name"
-    SEMICOLON@[60; 61) ";"
-  WHITESPACE@[61; 62) " "
-  COMMENT@[62; 91) "// Rust 2018 - Anchor ..."
-  WHITESPACE@[91; 92) "\n"
-  USE_ITEM@[92; 124)
-    USE_KW@[92; 95) "use"
-    WHITESPACE@[95; 96) " "
-    USE_TREE@[96; 123)
-      PATH@[96; 123)
-        PATH_SEGMENT@[96; 123)
-          NAME_REF@[96; 123)
-            IDENT@[96; 123) "item_in_scope_or_crat ..."
-    SEMICOLON@[123; 124) ";"
-  WHITESPACE@[124; 125) " "
-  COMMENT@[125; 153) "// Rust 2018 - Unifor ..."
-  WHITESPACE@[153; 154) "\n"
+SOURCE_FILE@0..154
+  USE_ITEM@0..17
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..16
+      PATH@4..16
+        PATH_SEGMENT@4..16
+          COLON2@4..6 "::"
+          NAME_REF@6..16
+            IDENT@6..16 "crate_name"
+    SEMICOLON@16..17 ";"
+  WHITESPACE@17..18 " "
+  COMMENT@18..45 "// Rust 2018 - All fl ..."
+  WHITESPACE@45..46 "\n"
+  USE_ITEM@46..61
+    USE_KW@46..49 "use"
+    WHITESPACE@49..50 " "
+    USE_TREE@50..60
+      PATH@50..60
+        PATH_SEGMENT@50..60
+          NAME_REF@50..60
+            IDENT@50..60 "crate_name"
+    SEMICOLON@60..61 ";"
+  WHITESPACE@61..62 " "
+  COMMENT@62..91 "// Rust 2018 - Anchor ..."
+  WHITESPACE@91..92 "\n"
+  USE_ITEM@92..124
+    USE_KW@92..95 "use"
+    WHITESPACE@95..96 " "
+    USE_TREE@96..123
+      PATH@96..123
+        PATH_SEGMENT@96..123
+          NAME_REF@96..123
+            IDENT@96..123 "item_in_scope_or_crat ..."
+    SEMICOLON@123..124 ";"
+  WHITESPACE@124..125 " "
+  COMMENT@125..153 "// Rust 2018 - Unifor ..."
+  WHITESPACE@153..154 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index 88e72d057..a1c5475e7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
@@ -1,90 +1,90 @@
-SOURCE_FILE@[0; 94)
-  FN_DEF@[0; 93)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 93)
-      BLOCK@[10; 93)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 36)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          TUPLE_PAT@[20; 30)
-            L_PAREN@[20; 21) "("
-            BIND_PAT@[21; 22)
-              NAME@[21; 22)
-                IDENT@[21; 22) "a"
-            COMMA@[22; 23) ","
-            WHITESPACE@[23; 24) " "
-            BIND_PAT@[24; 25)
-              NAME@[24; 25)
-                IDENT@[24; 25) "b"
-            COMMA@[25; 26) ","
-            WHITESPACE@[26; 27) " "
-            DOT_DOT_PAT@[27; 29)
-              DOT2@[27; 29) ".."
-            R_PAREN@[29; 30) ")"
-          WHITESPACE@[30; 31) " "
-          EQ@[31; 32) "="
-          WHITESPACE@[32; 33) " "
-          TUPLE_EXPR@[33; 35)
-            L_PAREN@[33; 34) "("
-            R_PAREN@[34; 35) ")"
-          SEMICOLON@[35; 36) ";"
-        WHITESPACE@[36; 41) "\n    "
-        LET_STMT@[41; 55)
-          LET_KW@[41; 44) "let"
-          WHITESPACE@[44; 45) " "
-          TUPLE_PAT@[45; 49)
-            L_PAREN@[45; 46) "("
-            BIND_PAT@[46; 47)
-              NAME@[46; 47)
-                IDENT@[46; 47) "a"
-            COMMA@[47; 48) ","
-            R_PAREN@[48; 49) ")"
-          WHITESPACE@[49; 50) " "
-          EQ@[50; 51) "="
-          WHITESPACE@[51; 52) " "
-          TUPLE_EXPR@[52; 54)
-            L_PAREN@[52; 53) "("
-            R_PAREN@[53; 54) ")"
-          SEMICOLON@[54; 55) ";"
-        WHITESPACE@[55; 60) "\n    "
-        LET_STMT@[60; 74)
-          LET_KW@[60; 63) "let"
-          WHITESPACE@[63; 64) " "
-          TUPLE_PAT@[64; 68)
-            L_PAREN@[64; 65) "("
-            DOT_DOT_PAT@[65; 67)
-              DOT2@[65; 67) ".."
-            R_PAREN@[67; 68) ")"
-          WHITESPACE@[68; 69) " "
-          EQ@[69; 70) "="
-          WHITESPACE@[70; 71) " "
-          TUPLE_EXPR@[71; 73)
-            L_PAREN@[71; 72) "("
-            R_PAREN@[72; 73) ")"
-          SEMICOLON@[73; 74) ";"
-        WHITESPACE@[74; 79) "\n    "
-        LET_STMT@[79; 91)
-          LET_KW@[79; 82) "let"
-          WHITESPACE@[82; 83) " "
-          TUPLE_PAT@[83; 85)
-            L_PAREN@[83; 84) "("
-            R_PAREN@[84; 85) ")"
-          WHITESPACE@[85; 86) " "
-          EQ@[86; 87) "="
-          WHITESPACE@[87; 88) " "
-          TUPLE_EXPR@[88; 90)
-            L_PAREN@[88; 89) "("
-            R_PAREN@[89; 90) ")"
-          SEMICOLON@[90; 91) ";"
-        WHITESPACE@[91; 92) "\n"
-        R_CURLY@[92; 93) "}"
-  WHITESPACE@[93; 94) "\n"
+SOURCE_FILE@0..94
+  FN_DEF@0..93
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..93
+      BLOCK@10..93
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..36
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          TUPLE_PAT@20..30
+            L_PAREN@20..21 "("
+            BIND_PAT@21..22
+              NAME@21..22
+                IDENT@21..22 "a"
+            COMMA@22..23 ","
+            WHITESPACE@23..24 " "
+            BIND_PAT@24..25
+              NAME@24..25
+                IDENT@24..25 "b"
+            COMMA@25..26 ","
+            WHITESPACE@26..27 " "
+            DOT_DOT_PAT@27..29
+              DOT2@27..29 ".."
+            R_PAREN@29..30 ")"
+          WHITESPACE@30..31 " "
+          EQ@31..32 "="
+          WHITESPACE@32..33 " "
+          TUPLE_EXPR@33..35
+            L_PAREN@33..34 "("
+            R_PAREN@34..35 ")"
+          SEMICOLON@35..36 ";"
+        WHITESPACE@36..41 "\n    "
+        LET_STMT@41..55
+          LET_KW@41..44 "let"
+          WHITESPACE@44..45 " "
+          TUPLE_PAT@45..49
+            L_PAREN@45..46 "("
+            BIND_PAT@46..47
+              NAME@46..47
+                IDENT@46..47 "a"
+            COMMA@47..48 ","
+            R_PAREN@48..49 ")"
+          WHITESPACE@49..50 " "
+          EQ@50..51 "="
+          WHITESPACE@51..52 " "
+          TUPLE_EXPR@52..54
+            L_PAREN@52..53 "("
+            R_PAREN@53..54 ")"
+          SEMICOLON@54..55 ";"
+        WHITESPACE@55..60 "\n    "
+        LET_STMT@60..74
+          LET_KW@60..63 "let"
+          WHITESPACE@63..64 " "
+          TUPLE_PAT@64..68
+            L_PAREN@64..65 "("
+            DOT_DOT_PAT@65..67
+              DOT2@65..67 ".."
+            R_PAREN@67..68 ")"
+          WHITESPACE@68..69 " "
+          EQ@69..70 "="
+          WHITESPACE@70..71 " "
+          TUPLE_EXPR@71..73
+            L_PAREN@71..72 "("
+            R_PAREN@72..73 ")"
+          SEMICOLON@73..74 ";"
+        WHITESPACE@74..79 "\n    "
+        LET_STMT@79..91
+          LET_KW@79..82 "let"
+          WHITESPACE@82..83 " "
+          TUPLE_PAT@83..85
+            L_PAREN@83..84 "("
+            R_PAREN@84..85 ")"
+          WHITESPACE@85..86 " "
+          EQ@86..87 "="
+          WHITESPACE@87..88 " "
+          TUPLE_EXPR@88..90
+            L_PAREN@88..89 "("
+            R_PAREN@89..90 ")"
+          SEMICOLON@90..91 ";"
+        WHITESPACE@91..92 "\n"
+        R_CURLY@92..93 "}"
+  WHITESPACE@93..94 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index 5e8f625dc..42a770a83 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
@@ -1,128 +1,128 @@
-SOURCE_FILE@[0; 146)
-  FN_DEF@[0; 145)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 145)
-      BLOCK@[10; 145)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 27)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          BIND_PAT@[20; 21)
-            NAME@[20; 21)
-              IDENT@[20; 21) "a"
-          WHITESPACE@[21; 22) " "
-          EQ@[22; 23) "="
-          WHITESPACE@[23; 24) " "
-          TUPLE_EXPR@[24; 26)
-            L_PAREN@[24; 25) "("
-            R_PAREN@[25; 26) ")"
-          SEMICOLON@[26; 27) ";"
-        WHITESPACE@[27; 32) "\n    "
-        LET_STMT@[32; 47)
-          LET_KW@[32; 35) "let"
-          WHITESPACE@[35; 36) " "
-          BIND_PAT@[36; 41)
-            MUT_KW@[36; 39) "mut"
-            WHITESPACE@[39; 40) " "
-            NAME@[40; 41)
-              IDENT@[40; 41) "b"
-          WHITESPACE@[41; 42) " "
-          EQ@[42; 43) "="
-          WHITESPACE@[43; 44) " "
-          TUPLE_EXPR@[44; 46)
-            L_PAREN@[44; 45) "("
-            R_PAREN@[45; 46) ")"
-          SEMICOLON@[46; 47) ";"
-        WHITESPACE@[47; 52) "\n    "
-        LET_STMT@[52; 67)
-          LET_KW@[52; 55) "let"
-          WHITESPACE@[55; 56) " "
-          BIND_PAT@[56; 61)
-            REF_KW@[56; 59) "ref"
-            WHITESPACE@[59; 60) " "
-            NAME@[60; 61)
-              IDENT@[60; 61) "c"
-          WHITESPACE@[61; 62) " "
-          EQ@[62; 63) "="
-          WHITESPACE@[63; 64) " "
-          TUPLE_EXPR@[64; 66)
-            L_PAREN@[64; 65) "("
-            R_PAREN@[65; 66) ")"
-          SEMICOLON@[66; 67) ";"
-        WHITESPACE@[67; 72) "\n    "
-        LET_STMT@[72; 91)
-          LET_KW@[72; 75) "let"
-          WHITESPACE@[75; 76) " "
-          BIND_PAT@[76; 85)
-            REF_KW@[76; 79) "ref"
-            WHITESPACE@[79; 80) " "
-            MUT_KW@[80; 83) "mut"
-            WHITESPACE@[83; 84) " "
-            NAME@[84; 85)
-              IDENT@[84; 85) "d"
-          WHITESPACE@[85; 86) " "
-          EQ@[86; 87) "="
-          WHITESPACE@[87; 88) " "
-          TUPLE_EXPR@[88; 90)
-            L_PAREN@[88; 89) "("
-            R_PAREN@[89; 90) ")"
-          SEMICOLON@[90; 91) ";"
-        WHITESPACE@[91; 96) "\n    "
-        LET_STMT@[96; 111)
-          LET_KW@[96; 99) "let"
-          WHITESPACE@[99; 100) " "
-          BIND_PAT@[100; 105)
-            NAME@[100; 101)
-              IDENT@[100; 101) "e"
-            WHITESPACE@[101; 102) " "
-            AT@[102; 103) "@"
-            WHITESPACE@[103; 104) " "
-            PLACEHOLDER_PAT@[104; 105)
-              UNDERSCORE@[104; 105) "_"
-          WHITESPACE@[105; 106) " "
-          EQ@[106; 107) "="
-          WHITESPACE@[107; 108) " "
-          TUPLE_EXPR@[108; 110)
-            L_PAREN@[108; 109) "("
-            R_PAREN@[109; 110) ")"
-          SEMICOLON@[110; 111) ";"
-        WHITESPACE@[111; 116) "\n    "
-        LET_STMT@[116; 143)
-          LET_KW@[116; 119) "let"
-          WHITESPACE@[119; 120) " "
-          BIND_PAT@[120; 137)
-            REF_KW@[120; 123) "ref"
-            WHITESPACE@[123; 124) " "
-            MUT_KW@[124; 127) "mut"
-            WHITESPACE@[127; 128) " "
-            NAME@[128; 129)
-              IDENT@[128; 129) "f"
-            WHITESPACE@[129; 130) " "
-            AT@[130; 131) "@"
-            WHITESPACE@[131; 132) " "
-            BIND_PAT@[132; 137)
-              NAME@[132; 133)
-                IDENT@[132; 133) "g"
-              WHITESPACE@[133; 134) " "
-              AT@[134; 135) "@"
-              WHITESPACE@[135; 136) " "
-              PLACEHOLDER_PAT@[136; 137)
-                UNDERSCORE@[136; 137) "_"
-          WHITESPACE@[137; 138) " "
-          EQ@[138; 139) "="
-          WHITESPACE@[139; 140) " "
-          TUPLE_EXPR@[140; 142)
-            L_PAREN@[140; 141) "("
-            R_PAREN@[141; 142) ")"
-          SEMICOLON@[142; 143) ";"
-        WHITESPACE@[143; 144) "\n"
-        R_CURLY@[144; 145) "}"
-  WHITESPACE@[145; 146) "\n"
+SOURCE_FILE@0..146
+  FN_DEF@0..145
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..145
+      BLOCK@10..145
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..27
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          BIND_PAT@20..21
+            NAME@20..21
+              IDENT@20..21 "a"
+          WHITESPACE@21..22 " "
+          EQ@22..23 "="
+          WHITESPACE@23..24 " "
+          TUPLE_EXPR@24..26
+            L_PAREN@24..25 "("
+            R_PAREN@25..26 ")"
+          SEMICOLON@26..27 ";"
+        WHITESPACE@27..32 "\n    "
+        LET_STMT@32..47
+          LET_KW@32..35 "let"
+          WHITESPACE@35..36 " "
+          BIND_PAT@36..41
+            MUT_KW@36..39 "mut"
+            WHITESPACE@39..40 " "
+            NAME@40..41
+              IDENT@40..41 "b"
+          WHITESPACE@41..42 " "
+          EQ@42..43 "="
+          WHITESPACE@43..44 " "
+          TUPLE_EXPR@44..46
+            L_PAREN@44..45 "("
+            R_PAREN@45..46 ")"
+          SEMICOLON@46..47 ";"
+        WHITESPACE@47..52 "\n    "
+        LET_STMT@52..67
+          LET_KW@52..55 "let"
+          WHITESPACE@55..56 " "
+          BIND_PAT@56..61
+            REF_KW@56..59 "ref"
+            WHITESPACE@59..60 " "
+            NAME@60..61
+              IDENT@60..61 "c"
+          WHITESPACE@61..62 " "
+          EQ@62..63 "="
+          WHITESPACE@63..64 " "
+          TUPLE_EXPR@64..66
+            L_PAREN@64..65 "("
+            R_PAREN@65..66 ")"
+          SEMICOLON@66..67 ";"
+        WHITESPACE@67..72 "\n    "
+        LET_STMT@72..91
+          LET_KW@72..75 "let"
+          WHITESPACE@75..76 " "
+          BIND_PAT@76..85
+            REF_KW@76..79 "ref"
+            WHITESPACE@79..80 " "
+            MUT_KW@80..83 "mut"
+            WHITESPACE@83..84 " "
+            NAME@84..85
+              IDENT@84..85 "d"
+          WHITESPACE@85..86 " "
+          EQ@86..87 "="
+          WHITESPACE@87..88 " "
+          TUPLE_EXPR@88..90
+            L_PAREN@88..89 "("
+            R_PAREN@89..90 ")"
+          SEMICOLON@90..91 ";"
+        WHITESPACE@91..96 "\n    "
+        LET_STMT@96..111
+          LET_KW@96..99 "let"
+          WHITESPACE@99..100 " "
+          BIND_PAT@100..105
+            NAME@100..101
+              IDENT@100..101 "e"
+            WHITESPACE@101..102 " "
+            AT@102..103 "@"
+            WHITESPACE@103..104 " "
+            PLACEHOLDER_PAT@104..105
+              UNDERSCORE@104..105 "_"
+          WHITESPACE@105..106 " "
+          EQ@106..107 "="
+          WHITESPACE@107..108 " "
+          TUPLE_EXPR@108..110
+            L_PAREN@108..109 "("
+            R_PAREN@109..110 ")"
+          SEMICOLON@110..111 ";"
+        WHITESPACE@111..116 "\n    "
+        LET_STMT@116..143
+          LET_KW@116..119 "let"
+          WHITESPACE@119..120 " "
+          BIND_PAT@120..137
+            REF_KW@120..123 "ref"
+            WHITESPACE@123..124 " "
+            MUT_KW@124..127 "mut"
+            WHITESPACE@127..128 " "
+            NAME@128..129
+              IDENT@128..129 "f"
+            WHITESPACE@129..130 " "
+            AT@130..131 "@"
+            WHITESPACE@131..132 " "
+            BIND_PAT@132..137
+              NAME@132..133
+                IDENT@132..133 "g"
+              WHITESPACE@133..134 " "
+              AT@134..135 "@"
+              WHITESPACE@135..136 " "
+              PLACEHOLDER_PAT@136..137
+                UNDERSCORE@136..137 "_"
+          WHITESPACE@137..138 " "
+          EQ@138..139 "="
+          WHITESPACE@139..140 " "
+          TUPLE_EXPR@140..142
+            L_PAREN@140..141 "("
+            R_PAREN@141..142 ")"
+          SEMICOLON@142..143 ";"
+        WHITESPACE@143..144 "\n"
+        R_CURLY@144..145 "}"
+  WHITESPACE@145..146 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index f2f649410..5414c90b8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
@@ -1,57 +1,57 @@
-SOURCE_FILE@[0; 50)
-  FN_DEF@[0; 49)
-    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) ")"
-    BLOCK_EXPR@[8; 49)
-      BLOCK@[8; 49)
-        L_CURLY@[8; 9) "{"
-        WHITESPACE@[9; 14) "\n    "
-        SEMICOLON@[14; 15) ";"
-        SEMICOLON@[15; 16) ";"
-        SEMICOLON@[16; 17) ";"
-        EXPR_STMT@[17; 29)
-          CALL_EXPR@[17; 28)
-            PATH_EXPR@[17; 26)
-              PATH@[17; 26)
-                PATH_SEGMENT@[17; 26)
-                  NAME_REF@[17; 26)
-                    IDENT@[17; 26) "some_expr"
-            ARG_LIST@[26; 28)
-              L_PAREN@[26; 27) "("
-              R_PAREN@[27; 28) ")"
-          SEMICOLON@[28; 29) ";"
-        SEMICOLON@[29; 30) ";"
-        SEMICOLON@[30; 31) ";"
-        SEMICOLON@[31; 32) ";"
-        EXPR_STMT@[32; 38)
-          BLOCK_EXPR@[32; 37)
-            BLOCK@[32; 37)
-              L_CURLY@[32; 33) "{"
-              SEMICOLON@[33; 34) ";"
-              SEMICOLON@[34; 35) ";"
-              SEMICOLON@[35; 36) ";"
-              R_CURLY@[36; 37) "}"
-          SEMICOLON@[37; 38) ";"
-        SEMICOLON@[38; 39) ";"
-        SEMICOLON@[39; 40) ";"
-        SEMICOLON@[40; 41) ";"
-        CALL_EXPR@[41; 47)
-          PATH_EXPR@[41; 43)
-            PATH@[41; 43)
-              PATH_SEGMENT@[41; 43)
-                NAME_REF@[41; 43)
-                  IDENT@[41; 43) "Ok"
-          ARG_LIST@[43; 47)
-            L_PAREN@[43; 44) "("
-            TUPLE_EXPR@[44; 46)
-              L_PAREN@[44; 45) "("
-              R_PAREN@[45; 46) ")"
-            R_PAREN@[46; 47) ")"
-        WHITESPACE@[47; 48) "\n"
-        R_CURLY@[48; 49) "}"
-  WHITESPACE@[49; 50) "\n"
+SOURCE_FILE@0..50
+  FN_DEF@0..49
+    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 ")"
+    BLOCK_EXPR@8..49
+      BLOCK@8..49
+        L_CURLY@8..9 "{"
+        WHITESPACE@9..14 "\n    "
+        SEMICOLON@14..15 ";"
+        SEMICOLON@15..16 ";"
+        SEMICOLON@16..17 ";"
+        EXPR_STMT@17..29
+          CALL_EXPR@17..28
+            PATH_EXPR@17..26
+              PATH@17..26
+                PATH_SEGMENT@17..26
+                  NAME_REF@17..26
+                    IDENT@17..26 "some_expr"
+            ARG_LIST@26..28
+              L_PAREN@26..27 "("
+              R_PAREN@27..28 ")"
+          SEMICOLON@28..29 ";"
+        SEMICOLON@29..30 ";"
+        SEMICOLON@30..31 ";"
+        SEMICOLON@31..32 ";"
+        EXPR_STMT@32..38
+          BLOCK_EXPR@32..37
+            BLOCK@32..37
+              L_CURLY@32..33 "{"
+              SEMICOLON@33..34 ";"
+              SEMICOLON@34..35 ";"
+              SEMICOLON@35..36 ";"
+              R_CURLY@36..37 "}"
+          SEMICOLON@37..38 ";"
+        SEMICOLON@38..39 ";"
+        SEMICOLON@39..40 ";"
+        SEMICOLON@40..41 ";"
+        CALL_EXPR@41..47
+          PATH_EXPR@41..43
+            PATH@41..43
+              PATH_SEGMENT@41..43
+                NAME_REF@41..43
+                  IDENT@41..43 "Ok"
+          ARG_LIST@43..47
+            L_PAREN@43..44 "("
+            TUPLE_EXPR@44..46
+              L_PAREN@44..45 "("
+              R_PAREN@45..46 ")"
+            R_PAREN@46..47 ")"
+        WHITESPACE@47..48 "\n"
+        R_CURLY@48..49 "}"
+  WHITESPACE@49..50 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
index 457c82e74..01d717d6b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
@@ -1,64 +1,64 @@
-SOURCE_FILE@[0; 53)
-  STRUCT_DEF@[0; 33)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 11)
-      IDENT@[7; 11) "Test"
-    TYPE_PARAM_LIST@[11; 14)
-      L_ANGLE@[11; 12) "<"
-      TYPE_PARAM@[12; 13)
-        NAME@[12; 13)
-          IDENT@[12; 13) "T"
-      R_ANGLE@[13; 14) ">"
-    TUPLE_FIELD_DEF_LIST@[14; 17)
-      L_PAREN@[14; 15) "("
-      TUPLE_FIELD_DEF@[15; 16)
-        PATH_TYPE@[15; 16)
-          PATH@[15; 16)
-            PATH_SEGMENT@[15; 16)
-              NAME_REF@[15; 16)
-                IDENT@[15; 16) "T"
-      R_PAREN@[16; 17) ")"
-    WHITESPACE@[17; 18) " "
-    WHERE_CLAUSE@[18; 32)
-      WHERE_KW@[18; 23) "where"
-      WHITESPACE@[23; 24) " "
-      WHERE_PRED@[24; 32)
-        PATH_TYPE@[24; 25)
-          PATH@[24; 25)
-            PATH_SEGMENT@[24; 25)
-              NAME_REF@[24; 25)
-                IDENT@[24; 25) "T"
-        COLON@[25; 26) ":"
-        WHITESPACE@[26; 27) " "
-        TYPE_BOUND_LIST@[27; 32)
-          TYPE_BOUND@[27; 32)
-            PATH_TYPE@[27; 32)
-              PATH@[27; 32)
-                PATH_SEGMENT@[27; 32)
-                  NAME_REF@[27; 32)
-                    IDENT@[27; 32) "Clone"
-    SEMICOLON@[32; 33) ";"
-  WHITESPACE@[33; 34) "\n"
-  STRUCT_DEF@[34; 52)
-    STRUCT_KW@[34; 40) "struct"
-    WHITESPACE@[40; 41) " "
-    NAME@[41; 45)
-      IDENT@[41; 45) "Test"
-    TYPE_PARAM_LIST@[45; 48)
-      L_ANGLE@[45; 46) "<"
-      TYPE_PARAM@[46; 47)
-        NAME@[46; 47)
-          IDENT@[46; 47) "T"
-      R_ANGLE@[47; 48) ">"
-    TUPLE_FIELD_DEF_LIST@[48; 51)
-      L_PAREN@[48; 49) "("
-      TUPLE_FIELD_DEF@[49; 50)
-        PATH_TYPE@[49; 50)
-          PATH@[49; 50)
-            PATH_SEGMENT@[49; 50)
-              NAME_REF@[49; 50)
-                IDENT@[49; 50) "T"
-      R_PAREN@[50; 51) ")"
-    SEMICOLON@[51; 52) ";"
-  WHITESPACE@[52; 53) "\n"
+SOURCE_FILE@0..53
+  STRUCT_DEF@0..33
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..11
+      IDENT@7..11 "Test"
+    TYPE_PARAM_LIST@11..14
+      L_ANGLE@11..12 "<"
+      TYPE_PARAM@12..13
+        NAME@12..13
+          IDENT@12..13 "T"
+      R_ANGLE@13..14 ">"
+    TUPLE_FIELD_DEF_LIST@14..17
+      L_PAREN@14..15 "("
+      TUPLE_FIELD_DEF@15..16
+        PATH_TYPE@15..16
+          PATH@15..16
+            PATH_SEGMENT@15..16
+              NAME_REF@15..16
+                IDENT@15..16 "T"
+      R_PAREN@16..17 ")"
+    WHITESPACE@17..18 " "
+    WHERE_CLAUSE@18..32
+      WHERE_KW@18..23 "where"
+      WHITESPACE@23..24 " "
+      WHERE_PRED@24..32
+        PATH_TYPE@24..25
+          PATH@24..25
+            PATH_SEGMENT@24..25
+              NAME_REF@24..25
+                IDENT@24..25 "T"
+        COLON@25..26 ":"
+        WHITESPACE@26..27 " "
+        TYPE_BOUND_LIST@27..32
+          TYPE_BOUND@27..32
+            PATH_TYPE@27..32
+              PATH@27..32
+                PATH_SEGMENT@27..32
+                  NAME_REF@27..32
+                    IDENT@27..32 "Clone"
+    SEMICOLON@32..33 ";"
+  WHITESPACE@33..34 "\n"
+  STRUCT_DEF@34..52
+    STRUCT_KW@34..40 "struct"
+    WHITESPACE@40..41 " "
+    NAME@41..45
+      IDENT@41..45 "Test"
+    TYPE_PARAM_LIST@45..48
+      L_ANGLE@45..46 "<"
+      TYPE_PARAM@46..47
+        NAME@46..47
+          IDENT@46..47 "T"
+      R_ANGLE@47..48 ">"
+    TUPLE_FIELD_DEF_LIST@48..51
+      L_PAREN@48..49 "("
+      TUPLE_FIELD_DEF@49..50
+        PATH_TYPE@49..50
+          PATH@49..50
+            PATH_SEGMENT@49..50
+              NAME_REF@49..50
+                IDENT@49..50 "T"
+      R_PAREN@50..51 ")"
+    SEMICOLON@51..52 ";"
+  WHITESPACE@52..53 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
index 0b1552a9d..3c0ef9005 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
@@ -1,41 +1,41 @@
-SOURCE_FILE@[0; 60)
-  STRUCT_DEF@[0; 59)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 8)
-      IDENT@[7; 8) "S"
-    WHITESPACE@[8; 9) " "
-    TUPLE_FIELD_DEF_LIST@[9; 58)
-      L_PAREN@[9; 10) "("
-      WHITESPACE@[10; 15) "\n    "
-      TUPLE_FIELD_DEF@[15; 55)
-        ATTR@[15; 43)
-          POUND@[15; 16) "#"
-          L_BRACK@[16; 17) "["
-          PATH@[17; 22)
-            PATH_SEGMENT@[17; 22)
-              NAME_REF@[17; 22)
-                IDENT@[17; 22) "serde"
-          TOKEN_TREE@[22; 42)
-            L_PAREN@[22; 23) "("
-            IDENT@[23; 27) "with"
-            WHITESPACE@[27; 28) " "
-            EQ@[28; 29) "="
-            WHITESPACE@[29; 30) " "
-            STRING@[30; 41) "\"url_serde\""
-            R_PAREN@[41; 42) ")"
-          R_BRACK@[42; 43) "]"
-        WHITESPACE@[43; 48) "\n    "
-        VISIBILITY@[48; 51)
-          PUB_KW@[48; 51) "pub"
-        WHITESPACE@[51; 52) " "
-        PATH_TYPE@[52; 55)
-          PATH@[52; 55)
-            PATH_SEGMENT@[52; 55)
-              NAME_REF@[52; 55)
-                IDENT@[52; 55) "Uri"
-      COMMA@[55; 56) ","
-      WHITESPACE@[56; 57) "\n"
-      R_PAREN@[57; 58) ")"
-    SEMICOLON@[58; 59) ";"
-  WHITESPACE@[59; 60) "\n"
+SOURCE_FILE@0..60
+  STRUCT_DEF@0..59
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..8
+      IDENT@7..8 "S"
+    WHITESPACE@8..9 " "
+    TUPLE_FIELD_DEF_LIST@9..58
+      L_PAREN@9..10 "("
+      WHITESPACE@10..15 "\n    "
+      TUPLE_FIELD_DEF@15..55
+        ATTR@15..43
+          POUND@15..16 "#"
+          L_BRACK@16..17 "["
+          PATH@17..22
+            PATH_SEGMENT@17..22
+              NAME_REF@17..22
+                IDENT@17..22 "serde"
+          TOKEN_TREE@22..42
+            L_PAREN@22..23 "("
+            IDENT@23..27 "with"
+            WHITESPACE@27..28 " "
+            EQ@28..29 "="
+            WHITESPACE@29..30 " "
+            STRING@30..41 "\"url_serde\""
+            R_PAREN@41..42 ")"
+          R_BRACK@42..43 "]"
+        WHITESPACE@43..48 "\n    "
+        VISIBILITY@48..51
+          PUB_KW@48..51 "pub"
+        WHITESPACE@51..52 " "
+        PATH_TYPE@52..55
+          PATH@52..55
+            PATH_SEGMENT@52..55
+              NAME_REF@52..55
+                IDENT@52..55 "Uri"
+      COMMA@55..56 ","
+      WHITESPACE@56..57 "\n"
+      R_PAREN@57..58 ")"
+    SEMICOLON@58..59 ";"
+  WHITESPACE@59..60 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index 4f9e80e2e..ddfcf974e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
@@ -1,43 +1,43 @@
-SOURCE_FILE@[0; 41)
-  TYPE_ALIAS_DEF@[0; 16)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "A"
-    WHITESPACE@[6; 7) " "
-    EQ@[7; 8) "="
-    WHITESPACE@[8; 9) " "
-    MACRO_CALL@[9; 15)
-      PATH@[9; 12)
-        PATH_SEGMENT@[9; 12)
-          NAME_REF@[9; 12)
-            IDENT@[9; 12) "foo"
-      BANG@[12; 13) "!"
-      TOKEN_TREE@[13; 15)
-        L_PAREN@[13; 14) "("
-        R_PAREN@[14; 15) ")"
-    SEMICOLON@[15; 16) ";"
-  WHITESPACE@[16; 17) "\n"
-  TYPE_ALIAS_DEF@[17; 40)
-    TYPE_KW@[17; 21) "type"
-    WHITESPACE@[21; 22) " "
-    NAME@[22; 23)
-      IDENT@[22; 23) "B"
-    WHITESPACE@[23; 24) " "
-    EQ@[24; 25) "="
-    WHITESPACE@[25; 26) " "
-    MACRO_CALL@[26; 39)
-      PATH@[26; 36)
-        PATH@[26; 31)
-          PATH_SEGMENT@[26; 31)
-            CRATE_KW@[26; 31) "crate"
-        COLON2@[31; 33) "::"
-        PATH_SEGMENT@[33; 36)
-          NAME_REF@[33; 36)
-            IDENT@[33; 36) "foo"
-      BANG@[36; 37) "!"
-      TOKEN_TREE@[37; 39)
-        L_PAREN@[37; 38) "("
-        R_PAREN@[38; 39) ")"
-    SEMICOLON@[39; 40) ";"
-  WHITESPACE@[40; 41) "\n"
+SOURCE_FILE@0..41
+  TYPE_ALIAS_DEF@0..16
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "A"
+    WHITESPACE@6..7 " "
+    EQ@7..8 "="
+    WHITESPACE@8..9 " "
+    MACRO_CALL@9..15
+      PATH@9..12
+        PATH_SEGMENT@9..12
+          NAME_REF@9..12
+            IDENT@9..12 "foo"
+      BANG@12..13 "!"
+      TOKEN_TREE@13..15
+        L_PAREN@13..14 "("
+        R_PAREN@14..15 ")"
+    SEMICOLON@15..16 ";"
+  WHITESPACE@16..17 "\n"
+  TYPE_ALIAS_DEF@17..40
+    TYPE_KW@17..21 "type"
+    WHITESPACE@21..22 " "
+    NAME@22..23
+      IDENT@22..23 "B"
+    WHITESPACE@23..24 " "
+    EQ@24..25 "="
+    WHITESPACE@25..26 " "
+    MACRO_CALL@26..39
+      PATH@26..36
+        PATH@26..31
+          PATH_SEGMENT@26..31
+            CRATE_KW@26..31 "crate"
+        COLON2@31..33 "::"
+        PATH_SEGMENT@33..36
+          NAME_REF@33..36
+            IDENT@33..36 "foo"
+      BANG@36..37 "!"
+      TOKEN_TREE@37..39
+        L_PAREN@37..38 "("
+        R_PAREN@38..39 ")"
+    SEMICOLON@39..40 ";"
+  WHITESPACE@40..41 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index f9a4bc81b..a65a5c85f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -1,40 +1,40 @@
-SOURCE_FILE@[0; 94)
-  ENUM_DEF@[0; 8)
-    ENUM_KW@[0; 4) "enum"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "F"
-    ENUM_VARIANT_LIST@[6; 8)
-      L_CURLY@[6; 7) "{"
-      R_CURLY@[7; 8) "}"
-  WHITESPACE@[8; 9) "\n"
-  IMPL_DEF@[9; 93)
-    IMPL_KW@[9; 13) "impl"
-    WHITESPACE@[13; 14) " "
-    PATH_TYPE@[14; 15)
-      PATH@[14; 15)
-        PATH_SEGMENT@[14; 15)
-          NAME_REF@[14; 15)
-            IDENT@[14; 15) "F"
-    WHITESPACE@[15; 16) " "
-    ITEM_LIST@[16; 93)
-      L_CURLY@[16; 17) "{"
-      WHITESPACE@[17; 23) "\n     "
-      COMMENT@[23; 48) "//! This is a doc com ..."
-      WHITESPACE@[48; 54) "\n     "
-      ATTR@[54; 91)
-        POUND@[54; 55) "#"
-        BANG@[55; 56) "!"
-        L_BRACK@[56; 57) "["
-        PATH@[57; 60)
-          PATH_SEGMENT@[57; 60)
-            NAME_REF@[57; 60)
-              IDENT@[57; 60) "doc"
-        TOKEN_TREE@[60; 90)
-          L_PAREN@[60; 61) "("
-          STRING@[61; 89) "\"This is also a doc c ..."
-          R_PAREN@[89; 90) ")"
-        R_BRACK@[90; 91) "]"
-      WHITESPACE@[91; 92) "\n"
-      R_CURLY@[92; 93) "}"
-  WHITESPACE@[93; 94) "\n"
+SOURCE_FILE@0..94
+  ENUM_DEF@0..8
+    ENUM_KW@0..4 "enum"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "F"
+    ENUM_VARIANT_LIST@6..8
+      L_CURLY@6..7 "{"
+      R_CURLY@7..8 "}"
+  WHITESPACE@8..9 "\n"
+  IMPL_DEF@9..93
+    IMPL_KW@9..13 "impl"
+    WHITESPACE@13..14 " "
+    PATH_TYPE@14..15
+      PATH@14..15
+        PATH_SEGMENT@14..15
+          NAME_REF@14..15
+            IDENT@14..15 "F"
+    WHITESPACE@15..16 " "
+    ITEM_LIST@16..93
+      L_CURLY@16..17 "{"
+      WHITESPACE@17..23 "\n     "
+      COMMENT@23..48 "//! This is a doc com ..."
+      WHITESPACE@48..54 "\n     "
+      ATTR@54..91
+        POUND@54..55 "#"
+        BANG@55..56 "!"
+        L_BRACK@56..57 "["
+        PATH@57..60
+          PATH_SEGMENT@57..60
+            NAME_REF@57..60
+              IDENT@57..60 "doc"
+        TOKEN_TREE@60..90
+          L_PAREN@60..61 "("
+          STRING@61..89 "\"This is also a doc c ..."
+          R_PAREN@89..90 ")"
+        R_BRACK@90..91 "]"
+      WHITESPACE@91..92 "\n"
+      R_CURLY@92..93 "}"
+  WHITESPACE@93..94 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
index 852e4e489..8e080fb60 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
@@ -1,48 +1,48 @@
-SOURCE_FILE@[0; 58)
-  FN_DEF@[0; 57)
-    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; 57)
-      BLOCK@[9; 57)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        MATCH_EXPR@[15; 55)
-          MATCH_KW@[15; 20) "match"
-          WHITESPACE@[20; 21) " "
-          TUPLE_EXPR@[21; 23)
-            L_PAREN@[21; 22) "("
-            R_PAREN@[22; 23) ")"
-          WHITESPACE@[23; 24) " "
-          MATCH_ARM_LIST@[24; 55)
-            L_CURLY@[24; 25) "{"
-            WHITESPACE@[25; 34) "\n        "
-            MATCH_ARM@[34; 48)
-              PLACEHOLDER_PAT@[34; 35)
-                UNDERSCORE@[34; 35) "_"
-              WHITESPACE@[35; 36) " "
-              MATCH_GUARD@[36; 42)
-                IF_KW@[36; 38) "if"
-                WHITESPACE@[38; 39) " "
-                PATH_EXPR@[39; 42)
-                  PATH@[39; 42)
-                    PATH_SEGMENT@[39; 42)
-                      NAME_REF@[39; 42)
-                        IDENT@[39; 42) "foo"
-              WHITESPACE@[42; 43) " "
-              FAT_ARROW@[43; 45) "=>"
-              WHITESPACE@[45; 46) " "
-              TUPLE_EXPR@[46; 48)
-                L_PAREN@[46; 47) "("
-                R_PAREN@[47; 48) ")"
-            COMMA@[48; 49) ","
-            WHITESPACE@[49; 54) "\n    "
-            R_CURLY@[54; 55) "}"
-        WHITESPACE@[55; 56) "\n"
-        R_CURLY@[56; 57) "}"
-  WHITESPACE@[57; 58) "\n"
+SOURCE_FILE@0..58
+  FN_DEF@0..57
+    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..57
+      BLOCK@9..57
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        MATCH_EXPR@15..55
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..55
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            MATCH_ARM@34..48
+              PLACEHOLDER_PAT@34..35
+                UNDERSCORE@34..35 "_"
+              WHITESPACE@35..36 " "
+              MATCH_GUARD@36..42
+                IF_KW@36..38 "if"
+                WHITESPACE@38..39 " "
+                PATH_EXPR@39..42
+                  PATH@39..42
+                    PATH_SEGMENT@39..42
+                      NAME_REF@39..42
+                        IDENT@39..42 "foo"
+              WHITESPACE@42..43 " "
+              FAT_ARROW@43..45 "=>"
+              WHITESPACE@45..46 " "
+              TUPLE_EXPR@46..48
+                L_PAREN@46..47 "("
+                R_PAREN@47..48 ")"
+            COMMA@48..49 ","
+            WHITESPACE@49..54 "\n    "
+            R_CURLY@54..55 "}"
+        WHITESPACE@55..56 "\n"
+        R_CURLY@56..57 "}"
+  WHITESPACE@57..58 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index 7eec92e1b..728164f8e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -1,81 +1,81 @@
-SOURCE_FILE@[0; 139)
-  FN_DEF@[0; 138)
-    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; 138)
-      BLOCK@[9; 138)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        MATCH_EXPR@[15; 136)
-          MATCH_KW@[15; 20) "match"
-          WHITESPACE@[20; 21) " "
-          TUPLE_EXPR@[21; 23)
-            L_PAREN@[21; 22) "("
-            R_PAREN@[22; 23) ")"
-          WHITESPACE@[23; 24) " "
-          MATCH_ARM_LIST@[24; 136)
-            L_CURLY@[24; 25) "{"
-            WHITESPACE@[25; 34) "\n        "
-            ATTR@[34; 60)
-              POUND@[34; 35) "#"
-              BANG@[35; 36) "!"
-              L_BRACK@[36; 37) "["
-              PATH@[37; 40)
-                PATH_SEGMENT@[37; 40)
-                  NAME_REF@[37; 40)
-                    IDENT@[37; 40) "doc"
-              TOKEN_TREE@[40; 59)
-                L_PAREN@[40; 41) "("
-                STRING@[41; 58) "\"Inner attribute\""
-                R_PAREN@[58; 59) ")"
-              R_BRACK@[59; 60) "]"
-            WHITESPACE@[60; 69) "\n        "
-            ATTR@[69; 86)
-              POUND@[69; 70) "#"
-              BANG@[70; 71) "!"
-              L_BRACK@[71; 72) "["
-              PATH@[72; 75)
-                PATH_SEGMENT@[72; 75)
-                  NAME_REF@[72; 75)
-                    IDENT@[72; 75) "doc"
-              TOKEN_TREE@[75; 85)
-                L_PAREN@[75; 76) "("
-                STRING@[76; 84) "\"Can be\""
-                R_PAREN@[84; 85) ")"
-              R_BRACK@[85; 86) "]"
-            WHITESPACE@[86; 95) "\n        "
-            ATTR@[95; 113)
-              POUND@[95; 96) "#"
-              BANG@[96; 97) "!"
-              L_BRACK@[97; 98) "["
-              PATH@[98; 101)
-                PATH_SEGMENT@[98; 101)
-                  NAME_REF@[98; 101)
-                    IDENT@[98; 101) "doc"
-              TOKEN_TREE@[101; 112)
-                L_PAREN@[101; 102) "("
-                STRING@[102; 111) "\"Stacked\""
-                R_PAREN@[111; 112) ")"
-              R_BRACK@[112; 113) "]"
-            WHITESPACE@[113; 122) "\n        "
-            MATCH_ARM@[122; 129)
-              PLACEHOLDER_PAT@[122; 123)
-                UNDERSCORE@[122; 123) "_"
-              WHITESPACE@[123; 124) " "
-              FAT_ARROW@[124; 126) "=>"
-              WHITESPACE@[126; 127) " "
-              TUPLE_EXPR@[127; 129)
-                L_PAREN@[127; 128) "("
-                R_PAREN@[128; 129) ")"
-            COMMA@[129; 130) ","
-            WHITESPACE@[130; 135) "\n    "
-            R_CURLY@[135; 136) "}"
-        WHITESPACE@[136; 137) "\n"
-        R_CURLY@[137; 138) "}"
-  WHITESPACE@[138; 139) "\n"
+SOURCE_FILE@0..139
+  FN_DEF@0..138
+    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..138
+      BLOCK@9..138
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        MATCH_EXPR@15..136
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..136
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            ATTR@34..60
+              POUND@34..35 "#"
+              BANG@35..36 "!"
+              L_BRACK@36..37 "["
+              PATH@37..40
+                PATH_SEGMENT@37..40
+                  NAME_REF@37..40
+                    IDENT@37..40 "doc"
+              TOKEN_TREE@40..59
+                L_PAREN@40..41 "("
+                STRING@41..58 "\"Inner attribute\""
+                R_PAREN@58..59 ")"
+              R_BRACK@59..60 "]"
+            WHITESPACE@60..69 "\n        "
+            ATTR@69..86
+              POUND@69..70 "#"
+              BANG@70..71 "!"
+              L_BRACK@71..72 "["
+              PATH@72..75
+                PATH_SEGMENT@72..75
+                  NAME_REF@72..75
+                    IDENT@72..75 "doc"
+              TOKEN_TREE@75..85
+                L_PAREN@75..76 "("
+                STRING@76..84 "\"Can be\""
+                R_PAREN@84..85 ")"
+              R_BRACK@85..86 "]"
+            WHITESPACE@86..95 "\n        "
+            ATTR@95..113
+              POUND@95..96 "#"
+              BANG@96..97 "!"
+              L_BRACK@97..98 "["
+              PATH@98..101
+                PATH_SEGMENT@98..101
+                  NAME_REF@98..101
+                    IDENT@98..101 "doc"
+              TOKEN_TREE@101..112
+                L_PAREN@101..102 "("
+                STRING@102..111 "\"Stacked\""
+                R_PAREN@111..112 ")"
+              R_BRACK@112..113 "]"
+            WHITESPACE@113..122 "\n        "
+            MATCH_ARM@122..129
+              PLACEHOLDER_PAT@122..123
+                UNDERSCORE@122..123 "_"
+              WHITESPACE@123..124 " "
+              FAT_ARROW@124..126 "=>"
+              WHITESPACE@126..127 " "
+              TUPLE_EXPR@127..129
+                L_PAREN@127..128 "("
+                R_PAREN@128..129 ")"
+            COMMA@129..130 ","
+            WHITESPACE@130..135 "\n    "
+            R_CURLY@135..136 "}"
+        WHITESPACE@136..137 "\n"
+        R_CURLY@137..138 "}"
+  WHITESPACE@138..139 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index ff380b448..6123885e3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -1,146 +1,146 @@
-SOURCE_FILE@[0; 259)
-  FN_DEF@[0; 258)
-    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; 258)
-      BLOCK@[9; 258)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        MATCH_EXPR@[15; 256)
-          MATCH_KW@[15; 20) "match"
-          WHITESPACE@[20; 21) " "
-          TUPLE_EXPR@[21; 23)
-            L_PAREN@[21; 22) "("
-            R_PAREN@[22; 23) ")"
-          WHITESPACE@[23; 24) " "
-          MATCH_ARM_LIST@[24; 256)
-            L_CURLY@[24; 25) "{"
-            WHITESPACE@[25; 34) "\n        "
-            MATCH_ARM@[34; 74)
-              ATTR@[34; 58)
-                POUND@[34; 35) "#"
-                L_BRACK@[35; 36) "["
-                PATH@[36; 39)
-                  PATH_SEGMENT@[36; 39)
-                    NAME_REF@[36; 39)
-                      IDENT@[36; 39) "cfg"
-                TOKEN_TREE@[39; 57)
-                  L_PAREN@[39; 40) "("
-                  IDENT@[40; 47) "feature"
-                  WHITESPACE@[47; 48) " "
-                  EQ@[48; 49) "="
-                  WHITESPACE@[49; 50) " "
-                  STRING@[50; 56) "\"some\""
-                  R_PAREN@[56; 57) ")"
-                R_BRACK@[57; 58) "]"
-              WHITESPACE@[58; 67) "\n        "
-              PLACEHOLDER_PAT@[67; 68)
-                UNDERSCORE@[67; 68) "_"
-              WHITESPACE@[68; 69) " "
-              FAT_ARROW@[69; 71) "=>"
-              WHITESPACE@[71; 72) " "
-              TUPLE_EXPR@[72; 74)
-                L_PAREN@[72; 73) "("
-                R_PAREN@[73; 74) ")"
-            COMMA@[74; 75) ","
-            WHITESPACE@[75; 84) "\n        "
-            MATCH_ARM@[84; 125)
-              ATTR@[84; 109)
-                POUND@[84; 85) "#"
-                L_BRACK@[85; 86) "["
-                PATH@[86; 89)
-                  PATH_SEGMENT@[86; 89)
-                    NAME_REF@[86; 89)
-                      IDENT@[86; 89) "cfg"
-                TOKEN_TREE@[89; 108)
-                  L_PAREN@[89; 90) "("
-                  IDENT@[90; 97) "feature"
-                  WHITESPACE@[97; 98) " "
-                  EQ@[98; 99) "="
-                  WHITESPACE@[99; 100) " "
-                  STRING@[100; 107) "\"other\""
-                  R_PAREN@[107; 108) ")"
-                R_BRACK@[108; 109) "]"
-              WHITESPACE@[109; 118) "\n        "
-              PLACEHOLDER_PAT@[118; 119)
-                UNDERSCORE@[118; 119) "_"
-              WHITESPACE@[119; 120) " "
-              FAT_ARROW@[120; 122) "=>"
-              WHITESPACE@[122; 123) " "
-              TUPLE_EXPR@[123; 125)
-                L_PAREN@[123; 124) "("
-                R_PAREN@[124; 125) ")"
-            COMMA@[125; 126) ","
-            WHITESPACE@[126; 135) "\n        "
-            MATCH_ARM@[135; 249)
-              ATTR@[135; 159)
-                POUND@[135; 136) "#"
-                L_BRACK@[136; 137) "["
-                PATH@[137; 140)
-                  PATH_SEGMENT@[137; 140)
-                    NAME_REF@[137; 140)
-                      IDENT@[137; 140) "cfg"
-                TOKEN_TREE@[140; 158)
-                  L_PAREN@[140; 141) "("
-                  IDENT@[141; 148) "feature"
-                  WHITESPACE@[148; 149) " "
-                  EQ@[149; 150) "="
-                  WHITESPACE@[150; 151) " "
-                  STRING@[151; 157) "\"many\""
-                  R_PAREN@[157; 158) ")"
-                R_BRACK@[158; 159) "]"
-              WHITESPACE@[159; 168) "\n        "
-              ATTR@[168; 198)
-                POUND@[168; 169) "#"
-                L_BRACK@[169; 170) "["
-                PATH@[170; 173)
-                  PATH_SEGMENT@[170; 173)
-                    NAME_REF@[170; 173)
-                      IDENT@[170; 173) "cfg"
-                TOKEN_TREE@[173; 197)
-                  L_PAREN@[173; 174) "("
-                  IDENT@[174; 181) "feature"
-                  WHITESPACE@[181; 182) " "
-                  EQ@[182; 183) "="
-                  WHITESPACE@[183; 184) " "
-                  STRING@[184; 196) "\"attributes\""
-                  R_PAREN@[196; 197) ")"
-                R_BRACK@[197; 198) "]"
-              WHITESPACE@[198; 207) "\n        "
-              ATTR@[207; 233)
-                POUND@[207; 208) "#"
-                L_BRACK@[208; 209) "["
-                PATH@[209; 212)
-                  PATH_SEGMENT@[209; 212)
-                    NAME_REF@[209; 212)
-                      IDENT@[209; 212) "cfg"
-                TOKEN_TREE@[212; 232)
-                  L_PAREN@[212; 213) "("
-                  IDENT@[213; 220) "feature"
-                  WHITESPACE@[220; 221) " "
-                  EQ@[221; 222) "="
-                  WHITESPACE@[222; 223) " "
-                  STRING@[223; 231) "\"before\""
-                  R_PAREN@[231; 232) ")"
-                R_BRACK@[232; 233) "]"
-              WHITESPACE@[233; 242) "\n        "
-              PLACEHOLDER_PAT@[242; 243)
-                UNDERSCORE@[242; 243) "_"
-              WHITESPACE@[243; 244) " "
-              FAT_ARROW@[244; 246) "=>"
-              WHITESPACE@[246; 247) " "
-              TUPLE_EXPR@[247; 249)
-                L_PAREN@[247; 248) "("
-                R_PAREN@[248; 249) ")"
-            COMMA@[249; 250) ","
-            WHITESPACE@[250; 255) "\n    "
-            R_CURLY@[255; 256) "}"
-        WHITESPACE@[256; 257) "\n"
-        R_CURLY@[257; 258) "}"
-  WHITESPACE@[258; 259) "\n"
+SOURCE_FILE@0..259
+  FN_DEF@0..258
+    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..258
+      BLOCK@9..258
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        MATCH_EXPR@15..256
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..256
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            MATCH_ARM@34..74
+              ATTR@34..58
+                POUND@34..35 "#"
+                L_BRACK@35..36 "["
+                PATH@36..39
+                  PATH_SEGMENT@36..39
+                    NAME_REF@36..39
+                      IDENT@36..39 "cfg"
+                TOKEN_TREE@39..57
+                  L_PAREN@39..40 "("
+                  IDENT@40..47 "feature"
+                  WHITESPACE@47..48 " "
+                  EQ@48..49 "="
+                  WHITESPACE@49..50 " "
+                  STRING@50..56 "\"some\""
+                  R_PAREN@56..57 ")"
+                R_BRACK@57..58 "]"
+              WHITESPACE@58..67 "\n        "
+              PLACEHOLDER_PAT@67..68
+                UNDERSCORE@67..68 "_"
+              WHITESPACE@68..69 " "
+              FAT_ARROW@69..71 "=>"
+              WHITESPACE@71..72 " "
+              TUPLE_EXPR@72..74
+                L_PAREN@72..73 "("
+                R_PAREN@73..74 ")"
+            COMMA@74..75 ","
+            WHITESPACE@75..84 "\n        "
+            MATCH_ARM@84..125
+              ATTR@84..109
+                POUND@84..85 "#"
+                L_BRACK@85..86 "["
+                PATH@86..89
+                  PATH_SEGMENT@86..89
+                    NAME_REF@86..89
+                      IDENT@86..89 "cfg"
+                TOKEN_TREE@89..108
+                  L_PAREN@89..90 "("
+                  IDENT@90..97 "feature"
+                  WHITESPACE@97..98 " "
+                  EQ@98..99 "="
+                  WHITESPACE@99..100 " "
+                  STRING@100..107 "\"other\""
+                  R_PAREN@107..108 ")"
+                R_BRACK@108..109 "]"
+              WHITESPACE@109..118 "\n        "
+              PLACEHOLDER_PAT@118..119
+                UNDERSCORE@118..119 "_"
+              WHITESPACE@119..120 " "
+              FAT_ARROW@120..122 "=>"
+              WHITESPACE@122..123 " "
+              TUPLE_EXPR@123..125
+                L_PAREN@123..124 "("
+                R_PAREN@124..125 ")"
+            COMMA@125..126 ","
+            WHITESPACE@126..135 "\n        "
+            MATCH_ARM@135..249
+              ATTR@135..159
+                POUND@135..136 "#"
+                L_BRACK@136..137 "["
+                PATH@137..140
+                  PATH_SEGMENT@137..140
+                    NAME_REF@137..140
+                      IDENT@137..140 "cfg"
+                TOKEN_TREE@140..158
+                  L_PAREN@140..141 "("
+                  IDENT@141..148 "feature"
+                  WHITESPACE@148..149 " "
+                  EQ@149..150 "="
+                  WHITESPACE@150..151 " "
+                  STRING@151..157 "\"many\""
+                  R_PAREN@157..158 ")"
+                R_BRACK@158..159 "]"
+              WHITESPACE@159..168 "\n        "
+              ATTR@168..198
+                POUND@168..169 "#"
+                L_BRACK@169..170 "["
+                PATH@170..173
+                  PATH_SEGMENT@170..173
+                    NAME_REF@170..173
+                      IDENT@170..173 "cfg"
+                TOKEN_TREE@173..197
+                  L_PAREN@173..174 "("
+                  IDENT@174..181 "feature"
+                  WHITESPACE@181..182 " "
+                  EQ@182..183 "="
+                  WHITESPACE@183..184 " "
+                  STRING@184..196 "\"attributes\""
+                  R_PAREN@196..197 ")"
+                R_BRACK@197..198 "]"
+              WHITESPACE@198..207 "\n        "
+              ATTR@207..233
+                POUND@207..208 "#"
+                L_BRACK@208..209 "["
+                PATH@209..212
+                  PATH_SEGMENT@209..212
+                    NAME_REF@209..212
+                      IDENT@209..212 "cfg"
+                TOKEN_TREE@212..232
+                  L_PAREN@212..213 "("
+                  IDENT@213..220 "feature"
+                  WHITESPACE@220..221 " "
+                  EQ@221..222 "="
+                  WHITESPACE@222..223 " "
+                  STRING@223..231 "\"before\""
+                  R_PAREN@231..232 ")"
+                R_BRACK@232..233 "]"
+              WHITESPACE@233..242 "\n        "
+              PLACEHOLDER_PAT@242..243
+                UNDERSCORE@242..243 "_"
+              WHITESPACE@243..244 " "
+              FAT_ARROW@244..246 "=>"
+              WHITESPACE@246..247 " "
+              TUPLE_EXPR@247..249
+                L_PAREN@247..248 "("
+                R_PAREN@248..249 ")"
+            COMMA@249..250 ","
+            WHITESPACE@250..255 "\n    "
+            R_CURLY@255..256 "}"
+        WHITESPACE@256..257 "\n"
+        R_CURLY@257..258 "}"
+  WHITESPACE@258..259 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index a73ff9c90..67b9c10d5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -1,66 +1,66 @@
-SOURCE_FILE@[0; 64)
-  FN_DEF@[0; 63)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    TYPE_PARAM_LIST@[6; 49)
-      L_ANGLE@[6; 7) "<"
-      LIFETIME_PARAM@[7; 29)
-        ATTR@[7; 26)
-          POUND@[7; 8) "#"
-          L_BRACK@[8; 9) "["
-          PATH@[9; 15)
-            PATH_SEGMENT@[9; 15)
-              NAME_REF@[9; 15)
-                IDENT@[9; 15) "derive"
-          TOKEN_TREE@[15; 25)
-            L_PAREN@[15; 16) "("
-            IDENT@[16; 24) "Lifetime"
-            R_PAREN@[24; 25) ")"
-          R_BRACK@[25; 26) "]"
-        WHITESPACE@[26; 27) " "
-        LIFETIME@[27; 29) "\'a"
-      COMMA@[29; 30) ","
-      WHITESPACE@[30; 31) " "
-      TYPE_PARAM@[31; 48)
-        ATTR@[31; 46)
-          POUND@[31; 32) "#"
-          L_BRACK@[32; 33) "["
-          PATH@[33; 39)
-            PATH_SEGMENT@[33; 39)
-              NAME_REF@[33; 39)
-                IDENT@[33; 39) "derive"
-          TOKEN_TREE@[39; 45)
-            L_PAREN@[39; 40) "("
-            IDENT@[40; 44) "Type"
-            R_PAREN@[44; 45) ")"
-          R_BRACK@[45; 46) "]"
-        WHITESPACE@[46; 47) " "
-        NAME@[47; 48)
-          IDENT@[47; 48) "T"
-      R_ANGLE@[48; 49) ">"
-    PARAM_LIST@[49; 59)
-      L_PAREN@[49; 50) "("
-      PARAM@[50; 58)
-        PLACEHOLDER_PAT@[50; 51)
-          UNDERSCORE@[50; 51) "_"
-        COLON@[51; 52) ":"
-        WHITESPACE@[52; 53) " "
-        REFERENCE_TYPE@[53; 58)
-          AMP@[53; 54) "&"
-          LIFETIME@[54; 56) "\'a"
-          WHITESPACE@[56; 57) " "
-          PATH_TYPE@[57; 58)
-            PATH@[57; 58)
-              PATH_SEGMENT@[57; 58)
-                NAME_REF@[57; 58)
-                  IDENT@[57; 58) "T"
-      R_PAREN@[58; 59) ")"
-    WHITESPACE@[59; 60) " "
-    BLOCK_EXPR@[60; 63)
-      BLOCK@[60; 63)
-        L_CURLY@[60; 61) "{"
-        WHITESPACE@[61; 62) "\n"
-        R_CURLY@[62; 63) "}"
-  WHITESPACE@[63; 64) "\n"
+SOURCE_FILE@0..64
+  FN_DEF@0..63
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    TYPE_PARAM_LIST@6..49
+      L_ANGLE@6..7 "<"
+      LIFETIME_PARAM@7..29
+        ATTR@7..26
+          POUND@7..8 "#"
+          L_BRACK@8..9 "["
+          PATH@9..15
+            PATH_SEGMENT@9..15
+              NAME_REF@9..15
+                IDENT@9..15 "derive"
+          TOKEN_TREE@15..25
+            L_PAREN@15..16 "("
+            IDENT@16..24 "Lifetime"
+            R_PAREN@24..25 ")"
+          R_BRACK@25..26 "]"
+        WHITESPACE@26..27 " "
+        LIFETIME@27..29 "\'a"
+      COMMA@29..30 ","
+      WHITESPACE@30..31 " "
+      TYPE_PARAM@31..48
+        ATTR@31..46
+          POUND@31..32 "#"
+          L_BRACK@32..33 "["
+          PATH@33..39
+            PATH_SEGMENT@33..39
+              NAME_REF@33..39
+                IDENT@33..39 "derive"
+          TOKEN_TREE@39..45
+            L_PAREN@39..40 "("
+            IDENT@40..44 "Type"
+            R_PAREN@44..45 ")"
+          R_BRACK@45..46 "]"
+        WHITESPACE@46..47 " "
+        NAME@47..48
+          IDENT@47..48 "T"
+      R_ANGLE@48..49 ">"
+    PARAM_LIST@49..59
+      L_PAREN@49..50 "("
+      PARAM@50..58
+        PLACEHOLDER_PAT@50..51
+          UNDERSCORE@50..51 "_"
+        COLON@51..52 ":"
+        WHITESPACE@52..53 " "
+        REFERENCE_TYPE@53..58
+          AMP@53..54 "&"
+          LIFETIME@54..56 "\'a"
+          WHITESPACE@56..57 " "
+          PATH_TYPE@57..58
+            PATH@57..58
+              PATH_SEGMENT@57..58
+                NAME_REF@57..58
+                  IDENT@57..58 "T"
+      R_PAREN@58..59 ")"
+    WHITESPACE@59..60 " "
+    BLOCK_EXPR@60..63
+      BLOCK@60..63
+        L_CURLY@60..61 "{"
+        WHITESPACE@61..62 "\n"
+        R_CURLY@62..63 "}"
+  WHITESPACE@63..64 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
index af8067b12..b3a33c14d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
@@ -1,50 +1,50 @@
-SOURCE_FILE@[0; 57)
-  EXTERN_BLOCK@[0; 56)
-    ABI@[0; 10)
-      EXTERN_KW@[0; 6) "extern"
-      WHITESPACE@[6; 7) " "
-      STRING@[7; 10) "\"C\""
-    WHITESPACE@[10; 11) " "
-    EXTERN_ITEM_LIST@[11; 56)
-      L_CURLY@[11; 12) "{"
-      WHITESPACE@[12; 13) " "
-      FN_DEF@[13; 54)
-        FN_KW@[13; 15) "fn"
-        WHITESPACE@[15; 16) " "
-        NAME@[16; 22)
-          IDENT@[16; 22) "printf"
-        PARAM_LIST@[22; 46)
-          L_PAREN@[22; 23) "("
-          PARAM@[23; 40)
-            BIND_PAT@[23; 29)
-              NAME@[23; 29)
-                IDENT@[23; 29) "format"
-            COLON@[29; 30) ":"
-            WHITESPACE@[30; 31) " "
-            POINTER_TYPE@[31; 40)
-              STAR@[31; 32) "*"
-              CONST_KW@[32; 37) "const"
-              WHITESPACE@[37; 38) " "
-              PATH_TYPE@[38; 40)
-                PATH@[38; 40)
-                  PATH_SEGMENT@[38; 40)
-                    NAME_REF@[38; 40)
-                      IDENT@[38; 40) "i8"
-          COMMA@[40; 41) ","
-          WHITESPACE@[41; 42) " "
-          PARAM@[42; 45)
-            DOT3@[42; 45) "..."
-          R_PAREN@[45; 46) ")"
-        WHITESPACE@[46; 47) " "
-        RET_TYPE@[47; 53)
-          THIN_ARROW@[47; 49) "->"
-          WHITESPACE@[49; 50) " "
-          PATH_TYPE@[50; 53)
-            PATH@[50; 53)
-              PATH_SEGMENT@[50; 53)
-                NAME_REF@[50; 53)
-                  IDENT@[50; 53) "i32"
-        SEMICOLON@[53; 54) ";"
-      WHITESPACE@[54; 55) " "
-      R_CURLY@[55; 56) "}"
-  WHITESPACE@[56; 57) "\n"
+SOURCE_FILE@0..57
+  EXTERN_BLOCK@0..56
+    ABI@0..10
+      EXTERN_KW@0..6 "extern"
+      WHITESPACE@6..7 " "
+      STRING@7..10 "\"C\""
+    WHITESPACE@10..11 " "
+    EXTERN_ITEM_LIST@11..56
+      L_CURLY@11..12 "{"
+      WHITESPACE@12..13 " "
+      FN_DEF@13..54
+        FN_KW@13..15 "fn"
+        WHITESPACE@15..16 " "
+        NAME@16..22
+          IDENT@16..22 "printf"
+        PARAM_LIST@22..46
+          L_PAREN@22..23 "("
+          PARAM@23..40
+            BIND_PAT@23..29
+              NAME@23..29
+                IDENT@23..29 "format"
+            COLON@29..30 ":"
+            WHITESPACE@30..31 " "
+            POINTER_TYPE@31..40
+              STAR@31..32 "*"
+              CONST_KW@32..37 "const"
+              WHITESPACE@37..38 " "
+              PATH_TYPE@38..40
+                PATH@38..40
+                  PATH_SEGMENT@38..40
+                    NAME_REF@38..40
+                      IDENT@38..40 "i8"
+          COMMA@40..41 ","
+          WHITESPACE@41..42 " "
+          PARAM@42..45
+            DOT3@42..45 "..."
+          R_PAREN@45..46 ")"
+        WHITESPACE@46..47 " "
+        RET_TYPE@47..53
+          THIN_ARROW@47..49 "->"
+          WHITESPACE@49..50 " "
+          PATH_TYPE@50..53
+            PATH@50..53
+              PATH_SEGMENT@50..53
+                NAME_REF@50..53
+                  IDENT@50..53 "i32"
+        SEMICOLON@53..54 ";"
+      WHITESPACE@54..55 " "
+      R_CURLY@55..56 "}"
+  WHITESPACE@56..57 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
index 9c4bd7f11..baf22a8d7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
@@ -1,17 +1,17 @@
-SOURCE_FILE@[0; 18)
-  FN_DEF@[0; 17)
-    ASYNC_KW@[0; 5) "async"
-    WHITESPACE@[5; 6) " "
-    FN_KW@[6; 8) "fn"
-    WHITESPACE@[8; 9) " "
-    NAME@[9; 12)
-      IDENT@[9; 12) "foo"
-    PARAM_LIST@[12; 14)
-      L_PAREN@[12; 13) "("
-      R_PAREN@[13; 14) ")"
-    WHITESPACE@[14; 15) " "
-    BLOCK_EXPR@[15; 17)
-      BLOCK@[15; 17)
-        L_CURLY@[15; 16) "{"
-        R_CURLY@[16; 17) "}"
-  WHITESPACE@[17; 18) "\n"
+SOURCE_FILE@0..18
+  FN_DEF@0..17
+    ASYNC_KW@0..5 "async"
+    WHITESPACE@5..6 " "
+    FN_KW@6..8 "fn"
+    WHITESPACE@8..9 " "
+    NAME@9..12
+      IDENT@9..12 "foo"
+    PARAM_LIST@12..14
+      L_PAREN@12..13 "("
+      R_PAREN@13..14 ")"
+    WHITESPACE@14..15 " "
+    BLOCK_EXPR@15..17
+      BLOCK@15..17
+        L_CURLY@15..16 "{"
+        R_CURLY@16..17 "}"
+  WHITESPACE@17..18 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index f1f4de976..16f5b90b6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -1,32 +1,32 @@
-SOURCE_FILE@[0; 27)
-  FN_DEF@[0; 26)
-    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; 26)
-      BLOCK@[9; 26)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) " "
-        EXPR_STMT@[11; 24)
-          CALL_EXPR@[11; 23)
-            PATH_EXPR@[11; 21)
-              PATH@[11; 21)
-                PATH@[11; 16)
-                  PATH_SEGMENT@[11; 16)
-                    CRATE_KW@[11; 16) "crate"
-                COLON2@[16; 18) "::"
-                PATH_SEGMENT@[18; 21)
-                  NAME_REF@[18; 21)
-                    IDENT@[18; 21) "foo"
-            ARG_LIST@[21; 23)
-              L_PAREN@[21; 22) "("
-              R_PAREN@[22; 23) ")"
-          SEMICOLON@[23; 24) ";"
-        WHITESPACE@[24; 25) " "
-        R_CURLY@[25; 26) "}"
-  WHITESPACE@[26; 27) "\n"
+SOURCE_FILE@0..27
+  FN_DEF@0..26
+    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..26
+      BLOCK@9..26
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 " "
+        EXPR_STMT@11..24
+          CALL_EXPR@11..23
+            PATH_EXPR@11..21
+              PATH@11..21
+                PATH@11..16
+                  PATH_SEGMENT@11..16
+                    CRATE_KW@11..16 "crate"
+                COLON2@16..18 "::"
+                PATH_SEGMENT@18..21
+                  NAME_REF@18..21
+                    IDENT@18..21 "foo"
+            ARG_LIST@21..23
+              L_PAREN@21..22 "("
+              R_PAREN@22..23 ")"
+          SEMICOLON@23..24 ";"
+        WHITESPACE@24..25 " "
+        R_CURLY@25..26 "}"
+  WHITESPACE@26..27 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index a36c3df0e..07ed14773 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
@@ -1,48 +1,48 @@
-SOURCE_FILE@[0; 46)
-  FN_DEF@[0; 45)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 45)
-      BLOCK@[10; 45)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        RECORD_LIT@[16; 43)
-          PATH@[16; 17)
-            PATH_SEGMENT@[16; 17)
-              NAME_REF@[16; 17)
-                IDENT@[16; 17) "S"
-          WHITESPACE@[17; 18) " "
-          RECORD_FIELD_LIST@[18; 43)
-            L_CURLY@[18; 19) "{"
-            WHITESPACE@[19; 20) " "
-            RECORD_FIELD@[20; 41)
-              ATTR@[20; 32)
-                POUND@[20; 21) "#"
-                L_BRACK@[21; 22) "["
-                PATH@[22; 25)
-                  PATH_SEGMENT@[22; 25)
-                    NAME_REF@[22; 25)
-                      IDENT@[22; 25) "cfg"
-                TOKEN_TREE@[25; 31)
-                  L_PAREN@[25; 26) "("
-                  IDENT@[26; 30) "test"
-                  R_PAREN@[30; 31) ")"
-                R_BRACK@[31; 32) "]"
-              WHITESPACE@[32; 33) " "
-              NAME_REF@[33; 38)
-                IDENT@[33; 38) "field"
-              COLON@[38; 39) ":"
-              WHITESPACE@[39; 40) " "
-              LITERAL@[40; 41)
-                INT_NUMBER@[40; 41) "1"
-            WHITESPACE@[41; 42) " "
-            R_CURLY@[42; 43) "}"
-        WHITESPACE@[43; 44) "\n"
-        R_CURLY@[44; 45) "}"
-  WHITESPACE@[45; 46) "\n"
+SOURCE_FILE@0..46
+  FN_DEF@0..45
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..45
+      BLOCK@10..45
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        RECORD_LIT@16..43
+          PATH@16..17
+            PATH_SEGMENT@16..17
+              NAME_REF@16..17
+                IDENT@16..17 "S"
+          WHITESPACE@17..18 " "
+          RECORD_FIELD_LIST@18..43
+            L_CURLY@18..19 "{"
+            WHITESPACE@19..20 " "
+            RECORD_FIELD@20..41
+              ATTR@20..32
+                POUND@20..21 "#"
+                L_BRACK@21..22 "["
+                PATH@22..25
+                  PATH_SEGMENT@22..25
+                    NAME_REF@22..25
+                      IDENT@22..25 "cfg"
+                TOKEN_TREE@25..31
+                  L_PAREN@25..26 "("
+                  IDENT@26..30 "test"
+                  R_PAREN@30..31 ")"
+                R_BRACK@31..32 "]"
+              WHITESPACE@32..33 " "
+              NAME_REF@33..38
+                IDENT@33..38 "field"
+              COLON@38..39 ":"
+              WHITESPACE@39..40 " "
+              LITERAL@40..41
+                INT_NUMBER@40..41 "1"
+            WHITESPACE@41..42 " "
+            R_CURLY@42..43 "}"
+        WHITESPACE@43..44 "\n"
+        R_CURLY@44..45 "}"
+  WHITESPACE@45..46 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 3b462871a..8307d4c15 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -1,99 +1,99 @@
-SOURCE_FILE@[0; 82)
-  FN_DEF@[0; 81)
-    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; 81)
-      BLOCK@[9; 81)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 26)
-          ATTR@[15; 19)
-            POUND@[15; 16) "#"
-            L_BRACK@[16; 17) "["
-            PATH@[17; 18)
-              PATH_SEGMENT@[17; 18)
-                NAME_REF@[17; 18)
-                  IDENT@[17; 18) "A"
-            R_BRACK@[18; 19) "]"
-          WHITESPACE@[19; 20) " "
-          CALL_EXPR@[20; 25)
-            PATH_EXPR@[20; 23)
-              PATH@[20; 23)
-                PATH_SEGMENT@[20; 23)
-                  NAME_REF@[20; 23)
-                    IDENT@[20; 23) "foo"
-            ARG_LIST@[23; 25)
-              L_PAREN@[23; 24) "("
-              R_PAREN@[24; 25) ")"
-          SEMICOLON@[25; 26) ";"
-        WHITESPACE@[26; 31) "\n    "
-        EXPR_STMT@[31; 42)
-          ATTR@[31; 35)
-            POUND@[31; 32) "#"
-            L_BRACK@[32; 33) "["
-            PATH@[33; 34)
-              PATH_SEGMENT@[33; 34)
-                NAME_REF@[33; 34)
-                  IDENT@[33; 34) "B"
-            R_BRACK@[34; 35) "]"
-          WHITESPACE@[35; 36) " "
-          MACRO_CALL@[36; 42)
-            PATH@[36; 39)
-              PATH_SEGMENT@[36; 39)
-                NAME_REF@[36; 39)
-                  IDENT@[36; 39) "bar"
-            BANG@[39; 40) "!"
-            TOKEN_TREE@[40; 42)
-              L_CURLY@[40; 41) "{"
-              R_CURLY@[41; 42) "}"
-        WHITESPACE@[42; 47) "\n    "
-        EXPR_STMT@[47; 59)
-          ATTR@[47; 51)
-            POUND@[47; 48) "#"
-            L_BRACK@[48; 49) "["
-            PATH@[49; 50)
-              PATH_SEGMENT@[49; 50)
-                NAME_REF@[49; 50)
-                  IDENT@[49; 50) "C"
-            R_BRACK@[50; 51) "]"
-          WHITESPACE@[51; 52) " "
-          ATTR@[52; 56)
-            POUND@[52; 53) "#"
-            L_BRACK@[53; 54) "["
-            PATH@[54; 55)
-              PATH_SEGMENT@[54; 55)
-                NAME_REF@[54; 55)
-                  IDENT@[54; 55) "D"
-            R_BRACK@[55; 56) "]"
-          WHITESPACE@[56; 57) " "
-          BLOCK_EXPR@[57; 59)
-            BLOCK@[57; 59)
-              L_CURLY@[57; 58) "{"
-              R_CURLY@[58; 59) "}"
-        WHITESPACE@[59; 64) "\n    "
-        EXPR_STMT@[64; 79)
-          ATTR@[64; 68)
-            POUND@[64; 65) "#"
-            L_BRACK@[65; 66) "["
-            PATH@[66; 67)
-              PATH_SEGMENT@[66; 67)
-                NAME_REF@[66; 67)
-                  IDENT@[66; 67) "D"
-            R_BRACK@[67; 68) "]"
-          WHITESPACE@[68; 69) " "
-          RETURN_EXPR@[69; 78)
-            RETURN_KW@[69; 75) "return"
-            WHITESPACE@[75; 76) " "
-            TUPLE_EXPR@[76; 78)
-              L_PAREN@[76; 77) "("
-              R_PAREN@[77; 78) ")"
-          SEMICOLON@[78; 79) ";"
-        WHITESPACE@[79; 80) "\n"
-        R_CURLY@[80; 81) "}"
-  WHITESPACE@[81; 82) "\n"
+SOURCE_FILE@0..82
+  FN_DEF@0..81
+    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..81
+      BLOCK@9..81
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..26
+          ATTR@15..19
+            POUND@15..16 "#"
+            L_BRACK@16..17 "["
+            PATH@17..18
+              PATH_SEGMENT@17..18
+                NAME_REF@17..18
+                  IDENT@17..18 "A"
+            R_BRACK@18..19 "]"
+          WHITESPACE@19..20 " "
+          CALL_EXPR@20..25
+            PATH_EXPR@20..23
+              PATH@20..23
+                PATH_SEGMENT@20..23
+                  NAME_REF@20..23
+                    IDENT@20..23 "foo"
+            ARG_LIST@23..25
+              L_PAREN@23..24 "("
+              R_PAREN@24..25 ")"
+          SEMICOLON@25..26 ";"
+        WHITESPACE@26..31 "\n    "
+        EXPR_STMT@31..42
+          ATTR@31..35
+            POUND@31..32 "#"
+            L_BRACK@32..33 "["
+            PATH@33..34
+              PATH_SEGMENT@33..34
+                NAME_REF@33..34
+                  IDENT@33..34 "B"
+            R_BRACK@34..35 "]"
+          WHITESPACE@35..36 " "
+          MACRO_CALL@36..42
+            PATH@36..39
+              PATH_SEGMENT@36..39
+                NAME_REF@36..39
+                  IDENT@36..39 "bar"
+            BANG@39..40 "!"
+            TOKEN_TREE@40..42
+              L_CURLY@40..41 "{"
+              R_CURLY@41..42 "}"
+        WHITESPACE@42..47 "\n    "
+        EXPR_STMT@47..59
+          ATTR@47..51
+            POUND@47..48 "#"
+            L_BRACK@48..49 "["
+            PATH@49..50
+              PATH_SEGMENT@49..50
+                NAME_REF@49..50
+                  IDENT@49..50 "C"
+            R_BRACK@50..51 "]"
+          WHITESPACE@51..52 " "
+          ATTR@52..56
+            POUND@52..53 "#"
+            L_BRACK@53..54 "["
+            PATH@54..55
+              PATH_SEGMENT@54..55
+                NAME_REF@54..55
+                  IDENT@54..55 "D"
+            R_BRACK@55..56 "]"
+          WHITESPACE@56..57 " "
+          BLOCK_EXPR@57..59
+            BLOCK@57..59
+              L_CURLY@57..58 "{"
+              R_CURLY@58..59 "}"
+        WHITESPACE@59..64 "\n    "
+        EXPR_STMT@64..79
+          ATTR@64..68
+            POUND@64..65 "#"
+            L_BRACK@65..66 "["
+            PATH@66..67
+              PATH_SEGMENT@66..67
+                NAME_REF@66..67
+                  IDENT@66..67 "D"
+            R_BRACK@67..68 "]"
+          WHITESPACE@68..69 " "
+          RETURN_EXPR@69..78
+            RETURN_KW@69..75 "return"
+            WHITESPACE@75..76 " "
+            TUPLE_EXPR@76..78
+              L_PAREN@76..77 "("
+              R_PAREN@77..78 ")"
+          SEMICOLON@78..79 ";"
+        WHITESPACE@79..80 "\n"
+        R_CURLY@80..81 "}"
+  WHITESPACE@81..82 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 9bc6be62d..19c47ea25 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -1,59 +1,59 @@
-SOURCE_FILE@[0; 47)
-  FN_DEF@[0; 46)
-    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; 46)
-      BLOCK@[9; 46)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 31)
-          BLOCK_EXPR@[15; 31)
-            BLOCK@[15; 31)
-              L_CURLY@[15; 16) "{"
-              WHITESPACE@[16; 17) " "
-              TRY_EXPR@[17; 29)
-                ATTR@[17; 21)
-                  POUND@[17; 18) "#"
-                  L_BRACK@[18; 19) "["
-                  PATH@[19; 20)
-                    PATH_SEGMENT@[19; 20)
-                      NAME_REF@[19; 20)
-                        IDENT@[19; 20) "A"
-                  R_BRACK@[20; 21) "]"
-                WHITESPACE@[21; 22) " "
-                MACRO_CALL@[22; 28)
-                  PATH@[22; 25)
-                    PATH_SEGMENT@[22; 25)
-                      NAME_REF@[22; 25)
-                        IDENT@[22; 25) "bar"
-                  BANG@[25; 26) "!"
-                  TOKEN_TREE@[26; 28)
-                    L_PAREN@[26; 27) "("
-                    R_PAREN@[27; 28) ")"
-                QUESTION@[28; 29) "?"
-              WHITESPACE@[29; 30) " "
-              R_CURLY@[30; 31) "}"
-        WHITESPACE@[31; 36) "\n    "
-        REF_EXPR@[36; 44)
-          ATTR@[36; 40)
-            POUND@[36; 37) "#"
-            L_BRACK@[37; 38) "["
-            PATH@[38; 39)
-              PATH_SEGMENT@[38; 39)
-                NAME_REF@[38; 39)
-                  IDENT@[38; 39) "B"
-            R_BRACK@[39; 40) "]"
-          WHITESPACE@[40; 41) " "
-          AMP@[41; 42) "&"
-          TUPLE_EXPR@[42; 44)
-            L_PAREN@[42; 43) "("
-            R_PAREN@[43; 44) ")"
-        WHITESPACE@[44; 45) "\n"
-        R_CURLY@[45; 46) "}"
-  WHITESPACE@[46; 47) "\n"
+SOURCE_FILE@0..47
+  FN_DEF@0..46
+    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..46
+      BLOCK@9..46
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..31
+          BLOCK_EXPR@15..31
+            BLOCK@15..31
+              L_CURLY@15..16 "{"
+              WHITESPACE@16..17 " "
+              TRY_EXPR@17..29
+                ATTR@17..21
+                  POUND@17..18 "#"
+                  L_BRACK@18..19 "["
+                  PATH@19..20
+                    PATH_SEGMENT@19..20
+                      NAME_REF@19..20
+                        IDENT@19..20 "A"
+                  R_BRACK@20..21 "]"
+                WHITESPACE@21..22 " "
+                MACRO_CALL@22..28
+                  PATH@22..25
+                    PATH_SEGMENT@22..25
+                      NAME_REF@22..25
+                        IDENT@22..25 "bar"
+                  BANG@25..26 "!"
+                  TOKEN_TREE@26..28
+                    L_PAREN@26..27 "("
+                    R_PAREN@27..28 ")"
+                QUESTION@28..29 "?"
+              WHITESPACE@29..30 " "
+              R_CURLY@30..31 "}"
+        WHITESPACE@31..36 "\n    "
+        REF_EXPR@36..44
+          ATTR@36..40
+            POUND@36..37 "#"
+            L_BRACK@37..38 "["
+            PATH@38..39
+              PATH_SEGMENT@38..39
+                NAME_REF@38..39
+                  IDENT@38..39 "B"
+            R_BRACK@39..40 "]"
+          WHITESPACE@40..41 " "
+          AMP@41..42 "&"
+          TUPLE_EXPR@42..44
+            L_PAREN@42..43 "("
+            R_PAREN@43..44 ")"
+        WHITESPACE@44..45 "\n"
+        R_CURLY@45..46 "}"
+  WHITESPACE@46..47 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
index 8a972cdb2..5630b20af 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
@@ -1,37 +1,37 @@
-SOURCE_FILE@[0; 50)
-  FN_DEF@[0; 24)
-    ASYNC_KW@[0; 5) "async"
-    WHITESPACE@[5; 6) " "
-    UNSAFE_KW@[6; 12) "unsafe"
-    WHITESPACE@[12; 13) " "
-    FN_KW@[13; 15) "fn"
-    WHITESPACE@[15; 16) " "
-    NAME@[16; 19)
-      IDENT@[16; 19) "foo"
-    PARAM_LIST@[19; 21)
-      L_PAREN@[19; 20) "("
-      R_PAREN@[20; 21) ")"
-    WHITESPACE@[21; 22) " "
-    BLOCK_EXPR@[22; 24)
-      BLOCK@[22; 24)
-        L_CURLY@[22; 23) "{"
-        R_CURLY@[23; 24) "}"
-  WHITESPACE@[24; 25) "\n"
-  FN_DEF@[25; 49)
-    CONST_KW@[25; 30) "const"
-    WHITESPACE@[30; 31) " "
-    UNSAFE_KW@[31; 37) "unsafe"
-    WHITESPACE@[37; 38) " "
-    FN_KW@[38; 40) "fn"
-    WHITESPACE@[40; 41) " "
-    NAME@[41; 44)
-      IDENT@[41; 44) "bar"
-    PARAM_LIST@[44; 46)
-      L_PAREN@[44; 45) "("
-      R_PAREN@[45; 46) ")"
-    WHITESPACE@[46; 47) " "
-    BLOCK_EXPR@[47; 49)
-      BLOCK@[47; 49)
-        L_CURLY@[47; 48) "{"
-        R_CURLY@[48; 49) "}"
-  WHITESPACE@[49; 50) "\n"
+SOURCE_FILE@0..50
+  FN_DEF@0..24
+    ASYNC_KW@0..5 "async"
+    WHITESPACE@5..6 " "
+    UNSAFE_KW@6..12 "unsafe"
+    WHITESPACE@12..13 " "
+    FN_KW@13..15 "fn"
+    WHITESPACE@15..16 " "
+    NAME@16..19
+      IDENT@16..19 "foo"
+    PARAM_LIST@19..21
+      L_PAREN@19..20 "("
+      R_PAREN@20..21 ")"
+    WHITESPACE@21..22 " "
+    BLOCK_EXPR@22..24
+      BLOCK@22..24
+        L_CURLY@22..23 "{"
+        R_CURLY@23..24 "}"
+  WHITESPACE@24..25 "\n"
+  FN_DEF@25..49
+    CONST_KW@25..30 "const"
+    WHITESPACE@30..31 " "
+    UNSAFE_KW@31..37 "unsafe"
+    WHITESPACE@37..38 " "
+    FN_KW@38..40 "fn"
+    WHITESPACE@40..41 " "
+    NAME@41..44
+      IDENT@41..44 "bar"
+    PARAM_LIST@44..46
+      L_PAREN@44..45 "("
+      R_PAREN@45..46 ")"
+    WHITESPACE@46..47 " "
+    BLOCK_EXPR@47..49
+      BLOCK@47..49
+        L_CURLY@47..48 "{"
+        R_CURLY@48..49 "}"
+  WHITESPACE@49..50 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
index 31481d2f9..4946ee050 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
@@ -1,37 +1,37 @@
-SOURCE_FILE@[0; 33)
-  FN_DEF@[0; 32)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 32)
-      BLOCK@[10; 32)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 30)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          MACRO_PAT@[20; 25)
-            MACRO_CALL@[20; 25)
-              PATH@[20; 21)
-                PATH_SEGMENT@[20; 21)
-                  NAME_REF@[20; 21)
-                    IDENT@[20; 21) "m"
-              BANG@[21; 22) "!"
-              TOKEN_TREE@[22; 25)
-                L_PAREN@[22; 23) "("
-                IDENT@[23; 24) "x"
-                R_PAREN@[24; 25) ")"
-          WHITESPACE@[25; 26) " "
-          EQ@[26; 27) "="
-          WHITESPACE@[27; 28) " "
-          LITERAL@[28; 29)
-            INT_NUMBER@[28; 29) "0"
-          SEMICOLON@[29; 30) ";"
-        WHITESPACE@[30; 31) "\n"
-        R_CURLY@[31; 32) "}"
-  WHITESPACE@[32; 33) "\n"
+SOURCE_FILE@0..33
+  FN_DEF@0..32
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..32
+      BLOCK@10..32
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..30
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          MACRO_PAT@20..25
+            MACRO_CALL@20..25
+              PATH@20..21
+                PATH_SEGMENT@20..21
+                  NAME_REF@20..21
+                    IDENT@20..21 "m"
+              BANG@21..22 "!"
+              TOKEN_TREE@22..25
+                L_PAREN@22..23 "("
+                IDENT@23..24 "x"
+                R_PAREN@24..25 ")"
+          WHITESPACE@25..26 " "
+          EQ@26..27 "="
+          WHITESPACE@27..28 " "
+          LITERAL@28..29
+            INT_NUMBER@28..29 "0"
+          SEMICOLON@29..30 ";"
+        WHITESPACE@30..31 "\n"
+        R_CURLY@31..32 "}"
+  WHITESPACE@32..33 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index 1f2690c00..18fdd9dc9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
@@ -1,129 +1,129 @@
-SOURCE_FILE@[0; 135)
-  FN_DEF@[0; 134)
-    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; 134)
-      BLOCK@[9; 134)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 21)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          BIND_PAT@[19; 20)
-            NAME@[19; 20)
-              IDENT@[19; 20) "a"
-          SEMICOLON@[20; 21) ";"
-        WHITESPACE@[21; 26) "\n    "
-        LET_STMT@[26; 37)
-          LET_KW@[26; 29) "let"
-          WHITESPACE@[29; 30) " "
-          BIND_PAT@[30; 31)
-            NAME@[30; 31)
-              IDENT@[30; 31) "b"
-          COLON@[31; 32) ":"
-          WHITESPACE@[32; 33) " "
-          PATH_TYPE@[33; 36)
-            PATH@[33; 36)
-              PATH_SEGMENT@[33; 36)
-                NAME_REF@[33; 36)
-                  IDENT@[33; 36) "i32"
-          SEMICOLON@[36; 37) ";"
-        WHITESPACE@[37; 42) "\n    "
-        LET_STMT@[42; 53)
-          LET_KW@[42; 45) "let"
-          WHITESPACE@[45; 46) " "
-          BIND_PAT@[46; 47)
-            NAME@[46; 47)
-              IDENT@[46; 47) "c"
-          WHITESPACE@[47; 48) " "
-          EQ@[48; 49) "="
-          WHITESPACE@[49; 50) " "
-          LITERAL@[50; 52)
-            INT_NUMBER@[50; 52) "92"
-          SEMICOLON@[52; 53) ";"
-        WHITESPACE@[53; 58) "\n    "
-        LET_STMT@[58; 74)
-          LET_KW@[58; 61) "let"
-          WHITESPACE@[61; 62) " "
-          BIND_PAT@[62; 63)
-            NAME@[62; 63)
-              IDENT@[62; 63) "d"
-          COLON@[63; 64) ":"
-          WHITESPACE@[64; 65) " "
-          PATH_TYPE@[65; 68)
-            PATH@[65; 68)
-              PATH_SEGMENT@[65; 68)
-                NAME_REF@[65; 68)
-                  IDENT@[65; 68) "i32"
-          WHITESPACE@[68; 69) " "
-          EQ@[69; 70) "="
-          WHITESPACE@[70; 71) " "
-          LITERAL@[71; 73)
-            INT_NUMBER@[71; 73) "92"
-          SEMICOLON@[73; 74) ";"
-        WHITESPACE@[74; 79) "\n    "
-        LET_STMT@[79; 88)
-          LET_KW@[79; 82) "let"
-          WHITESPACE@[82; 83) " "
-          BIND_PAT@[83; 84)
-            NAME@[83; 84)
-              IDENT@[83; 84) "e"
-          COLON@[84; 85) ":"
-          WHITESPACE@[85; 86) " "
-          NEVER_TYPE@[86; 87)
-            BANG@[86; 87) "!"
-          SEMICOLON@[87; 88) ";"
-        WHITESPACE@[88; 93) "\n    "
-        LET_STMT@[93; 107)
-          LET_KW@[93; 96) "let"
-          WHITESPACE@[96; 97) " "
-          PLACEHOLDER_PAT@[97; 98)
-            UNDERSCORE@[97; 98) "_"
-          COLON@[98; 99) ":"
-          WHITESPACE@[99; 100) " "
-          NEVER_TYPE@[100; 101)
-            BANG@[100; 101) "!"
-          WHITESPACE@[101; 102) " "
-          EQ@[102; 103) "="
-          WHITESPACE@[103; 104) " "
-          BLOCK_EXPR@[104; 106)
-            BLOCK@[104; 106)
-              L_CURLY@[104; 105) "{"
-              R_CURLY@[105; 106) "}"
-          SEMICOLON@[106; 107) ";"
-        WHITESPACE@[107; 112) "\n    "
-        LET_STMT@[112; 132)
-          LET_KW@[112; 115) "let"
-          WHITESPACE@[115; 116) " "
-          BIND_PAT@[116; 117)
-            NAME@[116; 117)
-              IDENT@[116; 117) "f"
-          WHITESPACE@[117; 118) " "
-          EQ@[118; 119) "="
-          WHITESPACE@[119; 120) " "
-          LAMBDA_EXPR@[120; 131)
-            ATTR@[120; 127)
-              POUND@[120; 121) "#"
-              L_BRACK@[121; 122) "["
-              PATH@[122; 126)
-                PATH_SEGMENT@[122; 126)
-                  NAME_REF@[122; 126)
-                    IDENT@[122; 126) "attr"
-              R_BRACK@[126; 127) "]"
-            PARAM_LIST@[127; 129)
-              PIPE@[127; 128) "|"
-              PIPE@[128; 129) "|"
-            BLOCK_EXPR@[129; 131)
-              BLOCK@[129; 131)
-                L_CURLY@[129; 130) "{"
-                R_CURLY@[130; 131) "}"
-          SEMICOLON@[131; 132) ";"
-        WHITESPACE@[132; 133) "\n"
-        R_CURLY@[133; 134) "}"
-  WHITESPACE@[134; 135) "\n"
+SOURCE_FILE@0..135
+  FN_DEF@0..134
+    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..134
+      BLOCK@9..134
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..21
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          BIND_PAT@19..20
+            NAME@19..20
+              IDENT@19..20 "a"
+          SEMICOLON@20..21 ";"
+        WHITESPACE@21..26 "\n    "
+        LET_STMT@26..37
+          LET_KW@26..29 "let"
+          WHITESPACE@29..30 " "
+          BIND_PAT@30..31
+            NAME@30..31
+              IDENT@30..31 "b"
+          COLON@31..32 ":"
+          WHITESPACE@32..33 " "
+          PATH_TYPE@33..36
+            PATH@33..36
+              PATH_SEGMENT@33..36
+                NAME_REF@33..36
+                  IDENT@33..36 "i32"
+          SEMICOLON@36..37 ";"
+        WHITESPACE@37..42 "\n    "
+        LET_STMT@42..53
+          LET_KW@42..45 "let"
+          WHITESPACE@45..46 " "
+          BIND_PAT@46..47
+            NAME@46..47
+              IDENT@46..47 "c"
+          WHITESPACE@47..48 " "
+          EQ@48..49 "="
+          WHITESPACE@49..50 " "
+          LITERAL@50..52
+            INT_NUMBER@50..52 "92"
+          SEMICOLON@52..53 ";"
+        WHITESPACE@53..58 "\n    "
+        LET_STMT@58..74
+          LET_KW@58..61 "let"
+          WHITESPACE@61..62 " "
+          BIND_PAT@62..63
+            NAME@62..63
+              IDENT@62..63 "d"
+          COLON@63..64 ":"
+          WHITESPACE@64..65 " "
+          PATH_TYPE@65..68
+            PATH@65..68
+              PATH_SEGMENT@65..68
+                NAME_REF@65..68
+                  IDENT@65..68 "i32"
+          WHITESPACE@68..69 " "
+          EQ@69..70 "="
+          WHITESPACE@70..71 " "
+          LITERAL@71..73
+            INT_NUMBER@71..73 "92"
+          SEMICOLON@73..74 ";"
+        WHITESPACE@74..79 "\n    "
+        LET_STMT@79..88
+          LET_KW@79..82 "let"
+          WHITESPACE@82..83 " "
+          BIND_PAT@83..84
+            NAME@83..84
+              IDENT@83..84 "e"
+          COLON@84..85 ":"
+          WHITESPACE@85..86 " "
+          NEVER_TYPE@86..87
+            BANG@86..87 "!"
+          SEMICOLON@87..88 ";"
+        WHITESPACE@88..93 "\n    "
+        LET_STMT@93..107
+          LET_KW@93..96 "let"
+          WHITESPACE@96..97 " "
+          PLACEHOLDER_PAT@97..98
+            UNDERSCORE@97..98 "_"
+          COLON@98..99 ":"
+          WHITESPACE@99..100 " "
+          NEVER_TYPE@100..101
+            BANG@100..101 "!"
+          WHITESPACE@101..102 " "
+          EQ@102..103 "="
+          WHITESPACE@103..104 " "
+          BLOCK_EXPR@104..106
+            BLOCK@104..106
+              L_CURLY@104..105 "{"
+              R_CURLY@105..106 "}"
+          SEMICOLON@106..107 ";"
+        WHITESPACE@107..112 "\n    "
+        LET_STMT@112..132
+          LET_KW@112..115 "let"
+          WHITESPACE@115..116 " "
+          BIND_PAT@116..117
+            NAME@116..117
+              IDENT@116..117 "f"
+          WHITESPACE@117..118 " "
+          EQ@118..119 "="
+          WHITESPACE@119..120 " "
+          LAMBDA_EXPR@120..131
+            ATTR@120..127
+              POUND@120..121 "#"
+              L_BRACK@121..122 "["
+              PATH@122..126
+                PATH_SEGMENT@122..126
+                  NAME_REF@122..126
+                    IDENT@122..126 "attr"
+              R_BRACK@126..127 "]"
+            PARAM_LIST@127..129
+              PIPE@127..128 "|"
+              PIPE@128..129 "|"
+            BLOCK_EXPR@129..131
+              BLOCK@129..131
+                L_CURLY@129..130 "{"
+                R_CURLY@130..131 "}"
+          SEMICOLON@131..132 ";"
+        WHITESPACE@132..133 "\n"
+        R_CURLY@133..134 "}"
+  WHITESPACE@134..135 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
index b96991035..01fffd7b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
@@ -1,33 +1,33 @@
-SOURCE_FILE@[0; 33)
-  FN_DEF@[0; 32)
-    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; 32)
-      BLOCK@[9; 32)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 30)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          TRY_EXPR@[23; 29)
-            TRY_KW@[23; 26) "try"
-            WHITESPACE@[26; 27) " "
-            BLOCK_EXPR@[27; 29)
-              BLOCK@[27; 29)
-                L_CURLY@[27; 28) "{"
-                R_CURLY@[28; 29) "}"
-          SEMICOLON@[29; 30) ";"
-        WHITESPACE@[30; 31) "\n"
-        R_CURLY@[31; 32) "}"
-  WHITESPACE@[32; 33) "\n"
+SOURCE_FILE@0..33
+  FN_DEF@0..32
+    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..32
+      BLOCK@9..32
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..30
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          TRY_EXPR@23..29
+            TRY_KW@23..26 "try"
+            WHITESPACE@26..27 " "
+            BLOCK_EXPR@27..29
+              BLOCK@27..29
+                L_CURLY@27..28 "{"
+                R_CURLY@28..29 "}"
+          SEMICOLON@29..30 ";"
+        WHITESPACE@30..31 "\n"
+        R_CURLY@31..32 "}"
+  WHITESPACE@32..33 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
index ed3d8fb0b..4a1c2b3a4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
@@ -1,31 +1,31 @@
-SOURCE_FILE@[0; 37)
-  TYPE_ALIAS_DEF@[0; 36)
-    EXISTENTIAL_KW@[0; 11) "existential"
-    WHITESPACE@[11; 12) " "
-    TYPE_KW@[12; 16) "type"
-    WHITESPACE@[16; 17) " "
-    NAME@[17; 20)
-      IDENT@[17; 20) "Foo"
-    COLON@[20; 21) ":"
-    WHITESPACE@[21; 22) " "
-    TYPE_BOUND_LIST@[22; 35)
-      TYPE_BOUND@[22; 35)
-        PATH_TYPE@[22; 35)
-          PATH@[22; 35)
-            PATH_SEGMENT@[22; 35)
-              NAME_REF@[22; 24)
-                IDENT@[22; 24) "Fn"
-              PARAM_LIST@[24; 26)
-                L_PAREN@[24; 25) "("
-                R_PAREN@[25; 26) ")"
-              WHITESPACE@[26; 27) " "
-              RET_TYPE@[27; 35)
-                THIN_ARROW@[27; 29) "->"
-                WHITESPACE@[29; 30) " "
-                PATH_TYPE@[30; 35)
-                  PATH@[30; 35)
-                    PATH_SEGMENT@[30; 35)
-                      NAME_REF@[30; 35)
-                        IDENT@[30; 35) "usize"
-    SEMICOLON@[35; 36) ";"
-  WHITESPACE@[36; 37) "\n"
+SOURCE_FILE@0..37
+  TYPE_ALIAS_DEF@0..36
+    EXISTENTIAL_KW@0..11 "existential"
+    WHITESPACE@11..12 " "
+    TYPE_KW@12..16 "type"
+    WHITESPACE@16..17 " "
+    NAME@17..20
+      IDENT@17..20 "Foo"
+    COLON@20..21 ":"
+    WHITESPACE@21..22 " "
+    TYPE_BOUND_LIST@22..35
+      TYPE_BOUND@22..35
+        PATH_TYPE@22..35
+          PATH@22..35
+            PATH_SEGMENT@22..35
+              NAME_REF@22..24
+                IDENT@22..24 "Fn"
+              PARAM_LIST@24..26
+                L_PAREN@24..25 "("
+                R_PAREN@25..26 ")"
+              WHITESPACE@26..27 " "
+              RET_TYPE@27..35
+                THIN_ARROW@27..29 "->"
+                WHITESPACE@29..30 " "
+                PATH_TYPE@30..35
+                  PATH@30..35
+                    PATH_SEGMENT@30..35
+                      NAME_REF@30..35
+                        IDENT@30..35 "usize"
+    SEMICOLON@35..36 ";"
+  WHITESPACE@36..37 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
index c392a7d84..498b3121e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
@@ -1,90 +1,90 @@
-SOURCE_FILE@[0; 106)
-  FN_DEF@[0; 105)
-    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; 105)
-      BLOCK@[9; 105)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 32)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          BIND_PAT@[19; 20)
-            NAME@[19; 20)
-              IDENT@[19; 20) "x"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          BOX_EXPR@[23; 31)
-            BOX_KW@[23; 26) "box"
-            WHITESPACE@[26; 27) " "
-            LITERAL@[27; 31)
-              INT_NUMBER@[27; 31) "1i32"
-          SEMICOLON@[31; 32) ";"
-        WHITESPACE@[32; 37) "\n    "
-        LET_STMT@[37; 66)
-          LET_KW@[37; 40) "let"
-          WHITESPACE@[40; 41) " "
-          BIND_PAT@[41; 42)
-            NAME@[41; 42)
-              IDENT@[41; 42) "y"
-          WHITESPACE@[42; 43) " "
-          EQ@[43; 44) "="
-          WHITESPACE@[44; 45) " "
-          TUPLE_EXPR@[45; 65)
-            L_PAREN@[45; 46) "("
-            BOX_EXPR@[46; 54)
-              BOX_KW@[46; 49) "box"
-              WHITESPACE@[49; 50) " "
-              LITERAL@[50; 54)
-                INT_NUMBER@[50; 54) "1i32"
-            COMMA@[54; 55) ","
-            WHITESPACE@[55; 56) " "
-            BOX_EXPR@[56; 64)
-              BOX_KW@[56; 59) "box"
-              WHITESPACE@[59; 60) " "
-              LITERAL@[60; 64)
-                INT_NUMBER@[60; 64) "2i32"
-            R_PAREN@[64; 65) ")"
-          SEMICOLON@[65; 66) ";"
-        WHITESPACE@[66; 71) "\n    "
-        LET_STMT@[71; 103)
-          LET_KW@[71; 74) "let"
-          WHITESPACE@[74; 75) " "
-          BIND_PAT@[75; 76)
-            NAME@[75; 76)
-              IDENT@[75; 76) "z"
-          WHITESPACE@[76; 77) " "
-          EQ@[77; 78) "="
-          WHITESPACE@[78; 79) " "
-          CALL_EXPR@[79; 102)
-            PATH_EXPR@[79; 82)
-              PATH@[79; 82)
-                PATH_SEGMENT@[79; 82)
-                  NAME_REF@[79; 82)
-                    IDENT@[79; 82) "Foo"
-            ARG_LIST@[82; 102)
-              L_PAREN@[82; 83) "("
-              BOX_EXPR@[83; 91)
-                BOX_KW@[83; 86) "box"
-                WHITESPACE@[86; 87) " "
-                LITERAL@[87; 91)
-                  INT_NUMBER@[87; 91) "1i32"
-              COMMA@[91; 92) ","
-              WHITESPACE@[92; 93) " "
-              BOX_EXPR@[93; 101)
-                BOX_KW@[93; 96) "box"
-                WHITESPACE@[96; 97) " "
-                LITERAL@[97; 101)
-                  INT_NUMBER@[97; 101) "2i32"
-              R_PAREN@[101; 102) ")"
-          SEMICOLON@[102; 103) ";"
-        WHITESPACE@[103; 104) "\n"
-        R_CURLY@[104; 105) "}"
-  WHITESPACE@[105; 106) "\n"
+SOURCE_FILE@0..106
+  FN_DEF@0..105
+    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..105
+      BLOCK@9..105
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..32
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          BIND_PAT@19..20
+            NAME@19..20
+              IDENT@19..20 "x"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          BOX_EXPR@23..31
+            BOX_KW@23..26 "box"
+            WHITESPACE@26..27 " "
+            LITERAL@27..31
+              INT_NUMBER@27..31 "1i32"
+          SEMICOLON@31..32 ";"
+        WHITESPACE@32..37 "\n    "
+        LET_STMT@37..66
+          LET_KW@37..40 "let"
+          WHITESPACE@40..41 " "
+          BIND_PAT@41..42
+            NAME@41..42
+              IDENT@41..42 "y"
+          WHITESPACE@42..43 " "
+          EQ@43..44 "="
+          WHITESPACE@44..45 " "
+          TUPLE_EXPR@45..65
+            L_PAREN@45..46 "("
+            BOX_EXPR@46..54
+              BOX_KW@46..49 "box"
+              WHITESPACE@49..50 " "
+              LITERAL@50..54
+                INT_NUMBER@50..54 "1i32"
+            COMMA@54..55 ","
+            WHITESPACE@55..56 " "
+            BOX_EXPR@56..64
+              BOX_KW@56..59 "box"
+              WHITESPACE@59..60 " "
+              LITERAL@60..64
+                INT_NUMBER@60..64 "2i32"
+            R_PAREN@64..65 ")"
+          SEMICOLON@65..66 ";"
+        WHITESPACE@66..71 "\n    "
+        LET_STMT@71..103
+          LET_KW@71..74 "let"
+          WHITESPACE@74..75 " "
+          BIND_PAT@75..76
+            NAME@75..76
+              IDENT@75..76 "z"
+          WHITESPACE@76..77 " "
+          EQ@77..78 "="
+          WHITESPACE@78..79 " "
+          CALL_EXPR@79..102
+            PATH_EXPR@79..82
+              PATH@79..82
+                PATH_SEGMENT@79..82
+                  NAME_REF@79..82
+                    IDENT@79..82 "Foo"
+            ARG_LIST@82..102
+              L_PAREN@82..83 "("
+              BOX_EXPR@83..91
+                BOX_KW@83..86 "box"
+                WHITESPACE@86..87 " "
+                LITERAL@87..91
+                  INT_NUMBER@87..91 "1i32"
+              COMMA@91..92 ","
+              WHITESPACE@92..93 " "
+              BOX_EXPR@93..101
+                BOX_KW@93..96 "box"
+                WHITESPACE@96..97 " "
+                LITERAL@97..101
+                  INT_NUMBER@97..101 "2i32"
+              R_PAREN@101..102 ")"
+          SEMICOLON@102..103 ";"
+        WHITESPACE@103..104 "\n"
+        R_CURLY@104..105 "}"
+  WHITESPACE@105..106 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index cff03fcf3..db58a928e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -1,56 +1,56 @@
-SOURCE_FILE@[0; 69)
-  IMPL_DEF@[0; 68)
-    IMPL_KW@[0; 4) "impl"
-    WHITESPACE@[4; 5) " "
-    PATH_TYPE@[5; 6)
-      PATH@[5; 6)
-        PATH_SEGMENT@[5; 6)
-          NAME_REF@[5; 6)
-            IDENT@[5; 6) "T"
-    WHITESPACE@[6; 7) " "
-    FOR_KW@[7; 10) "for"
-    WHITESPACE@[10; 11) " "
-    PATH_TYPE@[11; 14)
-      PATH@[11; 14)
-        PATH_SEGMENT@[11; 14)
-          NAME_REF@[11; 14)
-            IDENT@[11; 14) "Foo"
-    WHITESPACE@[14; 15) " "
-    ITEM_LIST@[15; 68)
-      L_CURLY@[15; 16) "{"
-      WHITESPACE@[16; 21) "\n    "
-      TYPE_ALIAS_DEF@[21; 42)
-        DEFAULT_KW@[21; 28) "default"
-        WHITESPACE@[28; 29) " "
-        TYPE_KW@[29; 33) "type"
-        WHITESPACE@[33; 34) " "
-        NAME@[34; 35)
-          IDENT@[34; 35) "T"
-        WHITESPACE@[35; 36) " "
-        EQ@[36; 37) "="
-        WHITESPACE@[37; 38) " "
-        PATH_TYPE@[38; 41)
-          PATH@[38; 41)
-            PATH_SEGMENT@[38; 41)
-              NAME_REF@[38; 41)
-                IDENT@[38; 41) "Bar"
-        SEMICOLON@[41; 42) ";"
-      WHITESPACE@[42; 47) "\n    "
-      FN_DEF@[47; 66)
-        DEFAULT_KW@[47; 54) "default"
-        WHITESPACE@[54; 55) " "
-        FN_KW@[55; 57) "fn"
-        WHITESPACE@[57; 58) " "
-        NAME@[58; 61)
-          IDENT@[58; 61) "foo"
-        PARAM_LIST@[61; 63)
-          L_PAREN@[61; 62) "("
-          R_PAREN@[62; 63) ")"
-        WHITESPACE@[63; 64) " "
-        BLOCK_EXPR@[64; 66)
-          BLOCK@[64; 66)
-            L_CURLY@[64; 65) "{"
-            R_CURLY@[65; 66) "}"
-      WHITESPACE@[66; 67) "\n"
-      R_CURLY@[67; 68) "}"
-  WHITESPACE@[68; 69) "\n"
+SOURCE_FILE@0..69
+  IMPL_DEF@0..68
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..6
+      PATH@5..6
+        PATH_SEGMENT@5..6
+          NAME_REF@5..6
+            IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    FOR_KW@7..10 "for"
+    WHITESPACE@10..11 " "
+    PATH_TYPE@11..14
+      PATH@11..14
+        PATH_SEGMENT@11..14
+          NAME_REF@11..14
+            IDENT@11..14 "Foo"
+    WHITESPACE@14..15 " "
+    ITEM_LIST@15..68
+      L_CURLY@15..16 "{"
+      WHITESPACE@16..21 "\n    "
+      TYPE_ALIAS_DEF@21..42
+        DEFAULT_KW@21..28 "default"
+        WHITESPACE@28..29 " "
+        TYPE_KW@29..33 "type"
+        WHITESPACE@33..34 " "
+        NAME@34..35
+          IDENT@34..35 "T"
+        WHITESPACE@35..36 " "
+        EQ@36..37 "="
+        WHITESPACE@37..38 " "
+        PATH_TYPE@38..41
+          PATH@38..41
+            PATH_SEGMENT@38..41
+              NAME_REF@38..41
+                IDENT@38..41 "Bar"
+        SEMICOLON@41..42 ";"
+      WHITESPACE@42..47 "\n    "
+      FN_DEF@47..66
+        DEFAULT_KW@47..54 "default"
+        WHITESPACE@54..55 " "
+        FN_KW@55..57 "fn"
+        WHITESPACE@57..58 " "
+        NAME@58..61
+          IDENT@58..61 "foo"
+        PARAM_LIST@61..63
+          L_PAREN@61..62 "("
+          R_PAREN@62..63 ")"
+        WHITESPACE@63..64 " "
+        BLOCK_EXPR@64..66
+          BLOCK@64..66
+            L_CURLY@64..65 "{"
+            R_CURLY@65..66 "}"
+      WHITESPACE@66..67 "\n"
+      R_CURLY@67..68 "}"
+  WHITESPACE@68..69 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
index f66f32370..4ca554ef8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
@@ -1,64 +1,64 @@
-SOURCE_FILE@[0; 111)
-  FN_DEF@[0; 110)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 18)
-      IDENT@[3; 18) "simple_function"
-    PARAM_LIST@[18; 20)
-      L_PAREN@[18; 19) "("
-      R_PAREN@[19; 20) ")"
-    WHITESPACE@[20; 21) " "
-    BLOCK_EXPR@[21; 110)
-      BLOCK@[21; 110)
-        L_CURLY@[21; 22) "{"
-        WHITESPACE@[22; 27) "\n    "
-        ENUM_DEF@[27; 75)
-          ENUM_KW@[27; 31) "enum"
-          WHITESPACE@[31; 32) " "
-          NAME@[32; 41)
-            IDENT@[32; 41) "LocalEnum"
-          WHITESPACE@[41; 42) " "
-          ENUM_VARIANT_LIST@[42; 75)
-            L_CURLY@[42; 43) "{"
-            WHITESPACE@[43; 52) "\n        "
-            ENUM_VARIANT@[52; 55)
-              NAME@[52; 55)
-                IDENT@[52; 55) "One"
-            COMMA@[55; 56) ","
-            WHITESPACE@[56; 65) "\n        "
-            ENUM_VARIANT@[65; 68)
-              NAME@[65; 68)
-                IDENT@[65; 68) "Two"
-            COMMA@[68; 69) ","
-            WHITESPACE@[69; 74) "\n    "
-            R_CURLY@[74; 75) "}"
-        SEMICOLON@[75; 76) ";"
-        WHITESPACE@[76; 81) "\n    "
-        FN_DEF@[81; 90)
-          FN_KW@[81; 83) "fn"
-          WHITESPACE@[83; 84) " "
-          NAME@[84; 85)
-            IDENT@[84; 85) "f"
-          PARAM_LIST@[85; 87)
-            L_PAREN@[85; 86) "("
-            R_PAREN@[86; 87) ")"
-          WHITESPACE@[87; 88) " "
-          BLOCK_EXPR@[88; 90)
-            BLOCK@[88; 90)
-              L_CURLY@[88; 89) "{"
-              R_CURLY@[89; 90) "}"
-        SEMICOLON@[90; 91) ";"
-        WHITESPACE@[91; 96) "\n    "
-        STRUCT_DEF@[96; 107)
-          STRUCT_KW@[96; 102) "struct"
-          WHITESPACE@[102; 103) " "
-          NAME@[103; 104)
-            IDENT@[103; 104) "S"
-          WHITESPACE@[104; 105) " "
-          RECORD_FIELD_DEF_LIST@[105; 107)
-            L_CURLY@[105; 106) "{"
-            R_CURLY@[106; 107) "}"
-        SEMICOLON@[107; 108) ";"
-        WHITESPACE@[108; 109) "\n"
-        R_CURLY@[109; 110) "}"
-  WHITESPACE@[110; 111) "\n"
+SOURCE_FILE@0..111
+  FN_DEF@0..110
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..18
+      IDENT@3..18 "simple_function"
+    PARAM_LIST@18..20
+      L_PAREN@18..19 "("
+      R_PAREN@19..20 ")"
+    WHITESPACE@20..21 " "
+    BLOCK_EXPR@21..110
+      BLOCK@21..110
+        L_CURLY@21..22 "{"
+        WHITESPACE@22..27 "\n    "
+        ENUM_DEF@27..75
+          ENUM_KW@27..31 "enum"
+          WHITESPACE@31..32 " "
+          NAME@32..41
+            IDENT@32..41 "LocalEnum"
+          WHITESPACE@41..42 " "
+          ENUM_VARIANT_LIST@42..75
+            L_CURLY@42..43 "{"
+            WHITESPACE@43..52 "\n        "
+            ENUM_VARIANT@52..55
+              NAME@52..55
+                IDENT@52..55 "One"
+            COMMA@55..56 ","
+            WHITESPACE@56..65 "\n        "
+            ENUM_VARIANT@65..68
+              NAME@65..68
+                IDENT@65..68 "Two"
+            COMMA@68..69 ","
+            WHITESPACE@69..74 "\n    "
+            R_CURLY@74..75 "}"
+        SEMICOLON@75..76 ";"
+        WHITESPACE@76..81 "\n    "
+        FN_DEF@81..90
+          FN_KW@81..83 "fn"
+          WHITESPACE@83..84 " "
+          NAME@84..85
+            IDENT@84..85 "f"
+          PARAM_LIST@85..87
+            L_PAREN@85..86 "("
+            R_PAREN@86..87 ")"
+          WHITESPACE@87..88 " "
+          BLOCK_EXPR@88..90
+            BLOCK@88..90
+              L_CURLY@88..89 "{"
+              R_CURLY@89..90 "}"
+        SEMICOLON@90..91 ";"
+        WHITESPACE@91..96 "\n    "
+        STRUCT_DEF@96..107
+          STRUCT_KW@96..102 "struct"
+          WHITESPACE@102..103 " "
+          NAME@103..104
+            IDENT@103..104 "S"
+          WHITESPACE@104..105 " "
+          RECORD_FIELD_DEF_LIST@105..107
+            L_CURLY@105..106 "{"
+            R_CURLY@106..107 "}"
+        SEMICOLON@107..108 ";"
+        WHITESPACE@108..109 "\n"
+        R_CURLY@109..110 "}"
+  WHITESPACE@110..111 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
index 4946e6325..7fa3b9f32 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
@@ -1,70 +1,70 @@
-SOURCE_FILE@[0; 67)
-  FN_DEF@[0; 66)
-    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; 66)
-      BLOCK@[9; 66)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 23)
-          AWAIT_EXPR@[15; 22)
-            PATH_EXPR@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "x"
-            DOT@[16; 17) "."
-            AWAIT_KW@[17; 22) "await"
-          SEMICOLON@[22; 23) ";"
-        WHITESPACE@[23; 28) "\n    "
-        EXPR_STMT@[28; 38)
-          AWAIT_EXPR@[28; 37)
-            FIELD_EXPR@[28; 31)
-              PATH_EXPR@[28; 29)
-                PATH@[28; 29)
-                  PATH_SEGMENT@[28; 29)
-                    NAME_REF@[28; 29)
-                      IDENT@[28; 29) "x"
-              DOT@[29; 30) "."
-              NAME_REF@[30; 31)
-                INT_NUMBER@[30; 31) "0"
-            DOT@[31; 32) "."
-            AWAIT_KW@[32; 37) "await"
-          SEMICOLON@[37; 38) ";"
-        WHITESPACE@[38; 43) "\n    "
-        EXPR_STMT@[43; 64)
-          METHOD_CALL_EXPR@[43; 63)
-            TRY_EXPR@[43; 55)
-              AWAIT_EXPR@[43; 54)
-                CALL_EXPR@[43; 48)
-                  FIELD_EXPR@[43; 46)
-                    PATH_EXPR@[43; 44)
-                      PATH@[43; 44)
-                        PATH_SEGMENT@[43; 44)
-                          NAME_REF@[43; 44)
-                            IDENT@[43; 44) "x"
-                    DOT@[44; 45) "."
-                    NAME_REF@[45; 46)
-                      INT_NUMBER@[45; 46) "0"
-                  ARG_LIST@[46; 48)
-                    L_PAREN@[46; 47) "("
-                    R_PAREN@[47; 48) ")"
-                DOT@[48; 49) "."
-                AWAIT_KW@[49; 54) "await"
-              QUESTION@[54; 55) "?"
-            DOT@[55; 56) "."
-            NAME_REF@[56; 61)
-              IDENT@[56; 61) "hello"
-            ARG_LIST@[61; 63)
-              L_PAREN@[61; 62) "("
-              R_PAREN@[62; 63) ")"
-          SEMICOLON@[63; 64) ";"
-        WHITESPACE@[64; 65) "\n"
-        R_CURLY@[65; 66) "}"
-  WHITESPACE@[66; 67) "\n"
+SOURCE_FILE@0..67
+  FN_DEF@0..66
+    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..66
+      BLOCK@9..66
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..23
+          AWAIT_EXPR@15..22
+            PATH_EXPR@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "x"
+            DOT@16..17 "."
+            AWAIT_KW@17..22 "await"
+          SEMICOLON@22..23 ";"
+        WHITESPACE@23..28 "\n    "
+        EXPR_STMT@28..38
+          AWAIT_EXPR@28..37
+            FIELD_EXPR@28..31
+              PATH_EXPR@28..29
+                PATH@28..29
+                  PATH_SEGMENT@28..29
+                    NAME_REF@28..29
+                      IDENT@28..29 "x"
+              DOT@29..30 "."
+              NAME_REF@30..31
+                INT_NUMBER@30..31 "0"
+            DOT@31..32 "."
+            AWAIT_KW@32..37 "await"
+          SEMICOLON@37..38 ";"
+        WHITESPACE@38..43 "\n    "
+        EXPR_STMT@43..64
+          METHOD_CALL_EXPR@43..63
+            TRY_EXPR@43..55
+              AWAIT_EXPR@43..54
+                CALL_EXPR@43..48
+                  FIELD_EXPR@43..46
+                    PATH_EXPR@43..44
+                      PATH@43..44
+                        PATH_SEGMENT@43..44
+                          NAME_REF@43..44
+                            IDENT@43..44 "x"
+                    DOT@44..45 "."
+                    NAME_REF@45..46
+                      INT_NUMBER@45..46 "0"
+                  ARG_LIST@46..48
+                    L_PAREN@46..47 "("
+                    R_PAREN@47..48 ")"
+                DOT@48..49 "."
+                AWAIT_KW@49..54 "await"
+              QUESTION@54..55 "?"
+            DOT@55..56 "."
+            NAME_REF@56..61
+              IDENT@56..61 "hello"
+            ARG_LIST@61..63
+              L_PAREN@61..62 "("
+              R_PAREN@62..63 ")"
+          SEMICOLON@63..64 ";"
+        WHITESPACE@64..65 "\n"
+        R_CURLY@65..66 "}"
+  WHITESPACE@66..67 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index d18096b47..a32484f2c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
@@ -1,56 +1,56 @@
-SOURCE_FILE@[0; 59)
-  FN_DEF@[0; 58)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 12)
-      IDENT@[3; 12) "print_all"
-    TYPE_PARAM_LIST@[12; 40)
-      L_ANGLE@[12; 13) "<"
-      TYPE_PARAM@[13; 39)
-        NAME@[13; 14)
-          IDENT@[13; 14) "T"
-        COLON@[14; 15) ":"
-        WHITESPACE@[15; 16) " "
-        TYPE_BOUND_LIST@[16; 39)
-          TYPE_BOUND@[16; 39)
-            PATH_TYPE@[16; 39)
-              PATH@[16; 39)
-                PATH_SEGMENT@[16; 39)
-                  NAME_REF@[16; 24)
-                    IDENT@[16; 24) "Iterator"
-                  TYPE_ARG_LIST@[24; 39)
-                    L_ANGLE@[24; 25) "<"
-                    ASSOC_TYPE_ARG@[25; 38)
-                      NAME_REF@[25; 29)
-                        IDENT@[25; 29) "Item"
-                      COLON@[29; 30) ":"
-                      WHITESPACE@[30; 31) " "
-                      TYPE_BOUND_LIST@[31; 38)
-                        TYPE_BOUND@[31; 38)
-                          PATH_TYPE@[31; 38)
-                            PATH@[31; 38)
-                              PATH_SEGMENT@[31; 38)
-                                NAME_REF@[31; 38)
-                                  IDENT@[31; 38) "Display"
-                    R_ANGLE@[38; 39) ">"
-      R_ANGLE@[39; 40) ">"
-    PARAM_LIST@[40; 55)
-      L_PAREN@[40; 41) "("
-      PARAM@[41; 54)
-        BIND_PAT@[41; 51)
-          NAME@[41; 51)
-            IDENT@[41; 51) "printables"
-        COLON@[51; 52) ":"
-        WHITESPACE@[52; 53) " "
-        PATH_TYPE@[53; 54)
-          PATH@[53; 54)
-            PATH_SEGMENT@[53; 54)
-              NAME_REF@[53; 54)
-                IDENT@[53; 54) "T"
-      R_PAREN@[54; 55) ")"
-    WHITESPACE@[55; 56) " "
-    BLOCK_EXPR@[56; 58)
-      BLOCK@[56; 58)
-        L_CURLY@[56; 57) "{"
-        R_CURLY@[57; 58) "}"
-  WHITESPACE@[58; 59) "\n"
+SOURCE_FILE@0..59
+  FN_DEF@0..58
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..12
+      IDENT@3..12 "print_all"
+    TYPE_PARAM_LIST@12..40
+      L_ANGLE@12..13 "<"
+      TYPE_PARAM@13..39
+        NAME@13..14
+          IDENT@13..14 "T"
+        COLON@14..15 ":"
+        WHITESPACE@15..16 " "
+        TYPE_BOUND_LIST@16..39
+          TYPE_BOUND@16..39
+            PATH_TYPE@16..39
+              PATH@16..39
+                PATH_SEGMENT@16..39
+                  NAME_REF@16..24
+                    IDENT@16..24 "Iterator"
+                  TYPE_ARG_LIST@24..39
+                    L_ANGLE@24..25 "<"
+                    ASSOC_TYPE_ARG@25..38
+                      NAME_REF@25..29
+                        IDENT@25..29 "Item"
+                      COLON@29..30 ":"
+                      WHITESPACE@30..31 " "
+                      TYPE_BOUND_LIST@31..38
+                        TYPE_BOUND@31..38
+                          PATH_TYPE@31..38
+                            PATH@31..38
+                              PATH_SEGMENT@31..38
+                                NAME_REF@31..38
+                                  IDENT@31..38 "Display"
+                    R_ANGLE@38..39 ">"
+      R_ANGLE@39..40 ">"
+    PARAM_LIST@40..55
+      L_PAREN@40..41 "("
+      PARAM@41..54
+        BIND_PAT@41..51
+          NAME@41..51
+            IDENT@41..51 "printables"
+        COLON@51..52 ":"
+        WHITESPACE@52..53 " "
+        PATH_TYPE@53..54
+          PATH@53..54
+            PATH_SEGMENT@53..54
+              NAME_REF@53..54
+                IDENT@53..54 "T"
+      R_PAREN@54..55 ")"
+    WHITESPACE@55..56 " "
+    BLOCK_EXPR@56..58
+      BLOCK@56..58
+        L_CURLY@56..57 "{"
+        R_CURLY@57..58 "}"
+  WHITESPACE@58..59 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
index ca1d69f64..9017236cc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
@@ -1,66 +1,66 @@
-SOURCE_FILE@[0; 52)
-  FN_DEF@[0; 51)
-    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; 51)
-      BLOCK@[9; 51)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 14) "\n   "
-        LET_STMT@[14; 34)
-          LET_KW@[14; 17) "let"
-          WHITESPACE@[17; 18) " "
-          BIND_PAT@[18; 23)
-            MUT_KW@[18; 21) "mut"
-            WHITESPACE@[21; 22) " "
-            NAME@[22; 23)
-              IDENT@[22; 23) "p"
-          WHITESPACE@[23; 24) " "
-          EQ@[24; 25) "="
-          WHITESPACE@[25; 26) " "
-          RECORD_LIT@[26; 33)
-            PATH@[26; 27)
-              PATH_SEGMENT@[26; 27)
-                NAME_REF@[26; 27)
-                  IDENT@[26; 27) "F"
-            RECORD_FIELD_LIST@[27; 33)
-              L_CURLY@[27; 28) "{"
-              RECORD_FIELD@[28; 32)
-                NAME_REF@[28; 29)
-                  IDENT@[28; 29) "x"
-                COLON@[29; 30) ":"
-                WHITESPACE@[30; 31) " "
-                LITERAL@[31; 32)
-                  INT_NUMBER@[31; 32) "5"
-              R_CURLY@[32; 33) "}"
-          SEMICOLON@[33; 34) ";"
-        WHITESPACE@[34; 38) "\n   "
-        EXPR_STMT@[38; 49)
-          BIN_EXPR@[38; 48)
-            FIELD_EXPR@[38; 43)
-              BLOCK_EXPR@[38; 41)
-                BLOCK@[38; 41)
-                  L_CURLY@[38; 39) "{"
-                  PATH_EXPR@[39; 40)
-                    PATH@[39; 40)
-                      PATH_SEGMENT@[39; 40)
-                        NAME_REF@[39; 40)
-                          IDENT@[39; 40) "p"
-                  R_CURLY@[40; 41) "}"
-              DOT@[41; 42) "."
-              NAME_REF@[42; 43)
-                IDENT@[42; 43) "x"
-            WHITESPACE@[43; 44) " "
-            EQ@[44; 45) "="
-            WHITESPACE@[45; 46) " "
-            LITERAL@[46; 48)
-              INT_NUMBER@[46; 48) "10"
-          SEMICOLON@[48; 49) ";"
-        WHITESPACE@[49; 50) "\n"
-        R_CURLY@[50; 51) "}"
-  WHITESPACE@[51; 52) "\n"
+SOURCE_FILE@0..52
+  FN_DEF@0..51
+    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..51
+      BLOCK@9..51
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..14 "\n   "
+        LET_STMT@14..34
+          LET_KW@14..17 "let"
+          WHITESPACE@17..18 " "
+          BIND_PAT@18..23
+            MUT_KW@18..21 "mut"
+            WHITESPACE@21..22 " "
+            NAME@22..23
+              IDENT@22..23 "p"
+          WHITESPACE@23..24 " "
+          EQ@24..25 "="
+          WHITESPACE@25..26 " "
+          RECORD_LIT@26..33
+            PATH@26..27
+              PATH_SEGMENT@26..27
+                NAME_REF@26..27
+                  IDENT@26..27 "F"
+            RECORD_FIELD_LIST@27..33
+              L_CURLY@27..28 "{"
+              RECORD_FIELD@28..32
+                NAME_REF@28..29
+                  IDENT@28..29 "x"
+                COLON@29..30 ":"
+                WHITESPACE@30..31 " "
+                LITERAL@31..32
+                  INT_NUMBER@31..32 "5"
+              R_CURLY@32..33 "}"
+          SEMICOLON@33..34 ";"
+        WHITESPACE@34..38 "\n   "
+        EXPR_STMT@38..49
+          BIN_EXPR@38..48
+            FIELD_EXPR@38..43
+              BLOCK_EXPR@38..41
+                BLOCK@38..41
+                  L_CURLY@38..39 "{"
+                  PATH_EXPR@39..40
+                    PATH@39..40
+                      PATH_SEGMENT@39..40
+                        NAME_REF@39..40
+                          IDENT@39..40 "p"
+                  R_CURLY@40..41 "}"
+              DOT@41..42 "."
+              NAME_REF@42..43
+                IDENT@42..43 "x"
+            WHITESPACE@43..44 " "
+            EQ@44..45 "="
+            WHITESPACE@45..46 " "
+            LITERAL@46..48
+              INT_NUMBER@46..48 "10"
+          SEMICOLON@48..49 ";"
+        WHITESPACE@49..50 "\n"
+        R_CURLY@50..51 "}"
+  WHITESPACE@51..52 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index e627b9746..2cb5b52f4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -1,26 +1,26 @@
-SOURCE_FILE@[0; 26)
-  FN_DEF@[0; 25)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 4)
-      IDENT@[3; 4) "f"
-    PARAM_LIST@[4; 22)
-      L_PAREN@[4; 5) "("
-      ATTR@[5; 16)
-        POUND@[5; 6) "#"
-        L_BRACK@[6; 7) "["
-        PATH@[7; 15)
-          PATH_SEGMENT@[7; 15)
-            NAME_REF@[7; 15)
-              IDENT@[7; 15) "must_use"
-        R_BRACK@[15; 16) "]"
-      WHITESPACE@[16; 17) " "
-      SELF_PARAM@[17; 21)
-        SELF_KW@[17; 21) "self"
-      R_PAREN@[21; 22) ")"
-    WHITESPACE@[22; 23) " "
-    BLOCK_EXPR@[23; 25)
-      BLOCK@[23; 25)
-        L_CURLY@[23; 24) "{"
-        R_CURLY@[24; 25) "}"
-  WHITESPACE@[25; 26) "\n"
+SOURCE_FILE@0..26
+  FN_DEF@0..25
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..4
+      IDENT@3..4 "f"
+    PARAM_LIST@4..22
+      L_PAREN@4..5 "("
+      ATTR@5..16
+        POUND@5..6 "#"
+        L_BRACK@6..7 "["
+        PATH@7..15
+          PATH_SEGMENT@7..15
+            NAME_REF@7..15
+              IDENT@7..15 "must_use"
+        R_BRACK@15..16 "]"
+      WHITESPACE@16..17 " "
+      SELF_PARAM@17..21
+        SELF_KW@17..21 "self"
+      R_PAREN@21..22 ")"
+    WHITESPACE@22..23 " "
+    BLOCK_EXPR@23..25
+      BLOCK@23..25
+        L_CURLY@23..24 "{"
+        R_CURLY@24..25 "}"
+  WHITESPACE@25..26 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index cf202c94b..ac3f4de26 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -1,35 +1,35 @@
-SOURCE_FILE@[0; 28)
-  FN_DEF@[0; 27)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 4)
-      IDENT@[3; 4) "f"
-    PARAM_LIST@[4; 24)
-      L_PAREN@[4; 5) "("
-      ATTR@[5; 13)
-        POUND@[5; 6) "#"
-        L_BRACK@[6; 7) "["
-        PATH@[7; 12)
-          PATH_SEGMENT@[7; 12)
-            NAME_REF@[7; 12)
-              IDENT@[7; 12) "attr1"
-        R_BRACK@[12; 13) "]"
-      WHITESPACE@[13; 14) " "
-      PARAM@[14; 23)
-        BIND_PAT@[14; 17)
-          NAME@[14; 17)
-            IDENT@[14; 17) "pat"
-        COLON@[17; 18) ":"
-        WHITESPACE@[18; 19) " "
-        PATH_TYPE@[19; 23)
-          PATH@[19; 23)
-            PATH_SEGMENT@[19; 23)
-              NAME_REF@[19; 23)
-                IDENT@[19; 23) "Type"
-      R_PAREN@[23; 24) ")"
-    WHITESPACE@[24; 25) " "
-    BLOCK_EXPR@[25; 27)
-      BLOCK@[25; 27)
-        L_CURLY@[25; 26) "{"
-        R_CURLY@[26; 27) "}"
-  WHITESPACE@[27; 28) "\n"
+SOURCE_FILE@0..28
+  FN_DEF@0..27
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..4
+      IDENT@3..4 "f"
+    PARAM_LIST@4..24
+      L_PAREN@4..5 "("
+      ATTR@5..13
+        POUND@5..6 "#"
+        L_BRACK@6..7 "["
+        PATH@7..12
+          PATH_SEGMENT@7..12
+            NAME_REF@7..12
+              IDENT@7..12 "attr1"
+        R_BRACK@12..13 "]"
+      WHITESPACE@13..14 " "
+      PARAM@14..23
+        BIND_PAT@14..17
+          NAME@14..17
+            IDENT@14..17 "pat"
+        COLON@17..18 ":"
+        WHITESPACE@18..19 " "
+        PATH_TYPE@19..23
+          PATH@19..23
+            PATH_SEGMENT@19..23
+              NAME_REF@19..23
+                IDENT@19..23 "Type"
+      R_PAREN@23..24 ")"
+    WHITESPACE@24..25 " "
+    BLOCK_EXPR@25..27
+      BLOCK@25..27
+        L_CURLY@25..26 "{"
+        R_CURLY@26..27 "}"
+  WHITESPACE@27..28 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
index 6d01140d2..8d4919cbd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
@@ -1,42 +1,42 @@
-SOURCE_FILE@[0; 51)
-  FN_DEF@[0; 50)
-    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; 50)
-      BLOCK@[9; 50)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 14) "\n   "
-        FOR_EXPR@[14; 48)
-          FOR_KW@[14; 17) "for"
-          WHITESPACE@[17; 18) " "
-          BIND_PAT@[18; 19)
-            NAME@[18; 19)
-              IDENT@[18; 19) "x"
-          WHITESPACE@[19; 20) " "
-          IN_KW@[20; 22) "in"
-          WHITESPACE@[22; 23) " "
-          RANGE_EXPR@[23; 27)
-            LITERAL@[23; 24)
-              INT_NUMBER@[23; 24) "0"
-            WHITESPACE@[24; 25) " "
-            DOT2@[25; 27) ".."
-          WHITESPACE@[27; 28) " "
-          BLOCK_EXPR@[28; 48)
-            BLOCK@[28; 48)
-              L_CURLY@[28; 29) "{"
-              WHITESPACE@[29; 37) "\n       "
-              EXPR_STMT@[37; 43)
-                BREAK_EXPR@[37; 42)
-                  BREAK_KW@[37; 42) "break"
-                SEMICOLON@[42; 43) ";"
-              WHITESPACE@[43; 47) "\n   "
-              R_CURLY@[47; 48) "}"
-        WHITESPACE@[48; 49) "\n"
-        R_CURLY@[49; 50) "}"
-  WHITESPACE@[50; 51) "\n"
+SOURCE_FILE@0..51
+  FN_DEF@0..50
+    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..50
+      BLOCK@9..50
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..14 "\n   "
+        FOR_EXPR@14..48
+          FOR_KW@14..17 "for"
+          WHITESPACE@17..18 " "
+          BIND_PAT@18..19
+            NAME@18..19
+              IDENT@18..19 "x"
+          WHITESPACE@19..20 " "
+          IN_KW@20..22 "in"
+          WHITESPACE@22..23 " "
+          RANGE_EXPR@23..27
+            LITERAL@23..24
+              INT_NUMBER@23..24 "0"
+            WHITESPACE@24..25 " "
+            DOT2@25..27 ".."
+          WHITESPACE@27..28 " "
+          BLOCK_EXPR@28..48
+            BLOCK@28..48
+              L_CURLY@28..29 "{"
+              WHITESPACE@29..37 "\n       "
+              EXPR_STMT@37..43
+                BREAK_EXPR@37..42
+                  BREAK_KW@37..42 "break"
+                SEMICOLON@42..43 ";"
+              WHITESPACE@43..47 "\n   "
+              R_CURLY@47..48 "}"
+        WHITESPACE@48..49 "\n"
+        R_CURLY@49..50 "}"
+  WHITESPACE@50..51 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
index 1d245f8f3..2c933fa76 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
@@ -1,111 +1,111 @@
-SOURCE_FILE@[0; 118)
-  FN_DEF@[0; 117)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 117)
-      BLOCK@[10; 117)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 31)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          BOX_PAT@[20; 25)
-            BOX_KW@[20; 23) "box"
-            WHITESPACE@[23; 24) " "
-            BIND_PAT@[24; 25)
-              NAME@[24; 25)
-                IDENT@[24; 25) "i"
-          WHITESPACE@[25; 26) " "
-          EQ@[26; 27) "="
-          WHITESPACE@[27; 28) " "
-          TUPLE_EXPR@[28; 30)
-            L_PAREN@[28; 29) "("
-            R_PAREN@[29; 30) ")"
-          SEMICOLON@[30; 31) ";"
-        WHITESPACE@[31; 36) "\n    "
-        LET_STMT@[36; 87)
-          LET_KW@[36; 39) "let"
-          WHITESPACE@[39; 40) " "
-          BOX_PAT@[40; 81)
-            BOX_KW@[40; 43) "box"
-            WHITESPACE@[43; 44) " "
-            RECORD_PAT@[44; 81)
-              PATH@[44; 49)
-                PATH_SEGMENT@[44; 49)
-                  NAME_REF@[44; 49)
-                    IDENT@[44; 49) "Outer"
-              WHITESPACE@[49; 50) " "
-              RECORD_FIELD_PAT_LIST@[50; 81)
-                L_CURLY@[50; 51) "{"
-                WHITESPACE@[51; 52) " "
-                RECORD_FIELD_PAT@[52; 57)
-                  BOX_PAT@[52; 57)
-                    BOX_KW@[52; 55) "box"
-                    WHITESPACE@[55; 56) " "
-                    BIND_PAT@[56; 57)
-                      NAME@[56; 57)
-                        IDENT@[56; 57) "i"
-                COMMA@[57; 58) ","
-                WHITESPACE@[58; 59) " "
-                RECORD_FIELD_PAT@[59; 79)
-                  NAME_REF@[59; 60)
-                    IDENT@[59; 60) "j"
-                  COLON@[60; 61) ":"
-                  WHITESPACE@[61; 62) " "
-                  BOX_PAT@[62; 79)
-                    BOX_KW@[62; 65) "box"
-                    WHITESPACE@[65; 66) " "
-                    TUPLE_STRUCT_PAT@[66; 79)
-                      PATH@[66; 71)
-                        PATH_SEGMENT@[66; 71)
-                          NAME_REF@[66; 71)
-                            IDENT@[66; 71) "Inner"
-                      L_PAREN@[71; 72) "("
-                      BOX_PAT@[72; 78)
-                        BOX_KW@[72; 75) "box"
-                        WHITESPACE@[75; 76) " "
-                        REF_PAT@[76; 78)
-                          AMP@[76; 77) "&"
-                          BIND_PAT@[77; 78)
-                            NAME@[77; 78)
-                              IDENT@[77; 78) "x"
-                      R_PAREN@[78; 79) ")"
-                WHITESPACE@[79; 80) " "
-                R_CURLY@[80; 81) "}"
-          WHITESPACE@[81; 82) " "
-          EQ@[82; 83) "="
-          WHITESPACE@[83; 84) " "
-          TUPLE_EXPR@[84; 86)
-            L_PAREN@[84; 85) "("
-            R_PAREN@[85; 86) ")"
-          SEMICOLON@[86; 87) ";"
-        WHITESPACE@[87; 92) "\n    "
-        LET_STMT@[92; 115)
-          LET_KW@[92; 95) "let"
-          WHITESPACE@[95; 96) " "
-          BOX_PAT@[96; 109)
-            BOX_KW@[96; 99) "box"
-            WHITESPACE@[99; 100) " "
-            BIND_PAT@[100; 109)
-              REF_KW@[100; 103) "ref"
-              WHITESPACE@[103; 104) " "
-              MUT_KW@[104; 107) "mut"
-              WHITESPACE@[107; 108) " "
-              NAME@[108; 109)
-                IDENT@[108; 109) "i"
-          WHITESPACE@[109; 110) " "
-          EQ@[110; 111) "="
-          WHITESPACE@[111; 112) " "
-          TUPLE_EXPR@[112; 114)
-            L_PAREN@[112; 113) "("
-            R_PAREN@[113; 114) ")"
-          SEMICOLON@[114; 115) ";"
-        WHITESPACE@[115; 116) "\n"
-        R_CURLY@[116; 117) "}"
-  WHITESPACE@[117; 118) "\n"
+SOURCE_FILE@0..118
+  FN_DEF@0..117
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..117
+      BLOCK@10..117
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..31
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          BOX_PAT@20..25
+            BOX_KW@20..23 "box"
+            WHITESPACE@23..24 " "
+            BIND_PAT@24..25
+              NAME@24..25
+                IDENT@24..25 "i"
+          WHITESPACE@25..26 " "
+          EQ@26..27 "="
+          WHITESPACE@27..28 " "
+          TUPLE_EXPR@28..30
+            L_PAREN@28..29 "("
+            R_PAREN@29..30 ")"
+          SEMICOLON@30..31 ";"
+        WHITESPACE@31..36 "\n    "
+        LET_STMT@36..87
+          LET_KW@36..39 "let"
+          WHITESPACE@39..40 " "
+          BOX_PAT@40..81
+            BOX_KW@40..43 "box"
+            WHITESPACE@43..44 " "
+            RECORD_PAT@44..81
+              PATH@44..49
+                PATH_SEGMENT@44..49
+                  NAME_REF@44..49
+                    IDENT@44..49 "Outer"
+              WHITESPACE@49..50 " "
+              RECORD_FIELD_PAT_LIST@50..81
+                L_CURLY@50..51 "{"
+                WHITESPACE@51..52 " "
+                RECORD_FIELD_PAT@52..57
+                  BOX_PAT@52..57
+                    BOX_KW@52..55 "box"
+                    WHITESPACE@55..56 " "
+                    BIND_PAT@56..57
+                      NAME@56..57
+                        IDENT@56..57 "i"
+                COMMA@57..58 ","
+                WHITESPACE@58..59 " "
+                RECORD_FIELD_PAT@59..79
+                  NAME_REF@59..60
+                    IDENT@59..60 "j"
+                  COLON@60..61 ":"
+                  WHITESPACE@61..62 " "
+                  BOX_PAT@62..79
+                    BOX_KW@62..65 "box"
+                    WHITESPACE@65..66 " "
+                    TUPLE_STRUCT_PAT@66..79
+                      PATH@66..71
+                        PATH_SEGMENT@66..71
+                          NAME_REF@66..71
+                            IDENT@66..71 "Inner"
+                      L_PAREN@71..72 "("
+                      BOX_PAT@72..78
+                        BOX_KW@72..75 "box"
+                        WHITESPACE@75..76 " "
+                        REF_PAT@76..78
+                          AMP@76..77 "&"
+                          BIND_PAT@77..78
+                            NAME@77..78
+                              IDENT@77..78 "x"
+                      R_PAREN@78..79 ")"
+                WHITESPACE@79..80 " "
+                R_CURLY@80..81 "}"
+          WHITESPACE@81..82 " "
+          EQ@82..83 "="
+          WHITESPACE@83..84 " "
+          TUPLE_EXPR@84..86
+            L_PAREN@84..85 "("
+            R_PAREN@85..86 ")"
+          SEMICOLON@86..87 ";"
+        WHITESPACE@87..92 "\n    "
+        LET_STMT@92..115
+          LET_KW@92..95 "let"
+          WHITESPACE@95..96 " "
+          BOX_PAT@96..109
+            BOX_KW@96..99 "box"
+            WHITESPACE@99..100 " "
+            BIND_PAT@100..109
+              REF_KW@100..103 "ref"
+              WHITESPACE@103..104 " "
+              MUT_KW@104..107 "mut"
+              WHITESPACE@107..108 " "
+              NAME@108..109
+                IDENT@108..109 "i"
+          WHITESPACE@109..110 " "
+          EQ@110..111 "="
+          WHITESPACE@111..112 " "
+          TUPLE_EXPR@112..114
+            L_PAREN@112..113 "("
+            R_PAREN@113..114 ")"
+          SEMICOLON@114..115 ";"
+        WHITESPACE@115..116 "\n"
+        R_CURLY@116..117 "}"
+  WHITESPACE@117..118 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
index 60186a992..e0b50d8be 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
@@ -1,456 +1,456 @@
-SOURCE_FILE@[0; 555)
-  FN_DEF@[0; 554)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 554)
-      BLOCK@[10; 554)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        LET_STMT@[16; 28)
-          LET_KW@[16; 19) "let"
-          WHITESPACE@[19; 20) " "
-          DOT_DOT_PAT@[20; 22)
-            DOT2@[20; 22) ".."
-          WHITESPACE@[22; 23) " "
-          EQ@[23; 24) "="
-          WHITESPACE@[24; 25) " "
-          TUPLE_EXPR@[25; 27)
-            L_PAREN@[25; 26) "("
-            R_PAREN@[26; 27) ")"
-          SEMICOLON@[27; 28) ";"
-        WHITESPACE@[28; 33) "\n    "
-        COMMENT@[33; 35) "//"
-        WHITESPACE@[35; 40) "\n    "
-        COMMENT@[40; 49) "// Tuples"
-        WHITESPACE@[49; 54) "\n    "
-        COMMENT@[54; 56) "//"
-        WHITESPACE@[56; 61) "\n    "
-        LET_STMT@[61; 78)
-          LET_KW@[61; 64) "let"
-          WHITESPACE@[64; 65) " "
-          TUPLE_PAT@[65; 72)
-            L_PAREN@[65; 66) "("
-            BIND_PAT@[66; 67)
-              NAME@[66; 67)
-                IDENT@[66; 67) "a"
-            COMMA@[67; 68) ","
-            WHITESPACE@[68; 69) " "
-            DOT_DOT_PAT@[69; 71)
-              DOT2@[69; 71) ".."
-            R_PAREN@[71; 72) ")"
-          WHITESPACE@[72; 73) " "
-          EQ@[73; 74) "="
-          WHITESPACE@[74; 75) " "
-          TUPLE_EXPR@[75; 77)
-            L_PAREN@[75; 76) "("
-            R_PAREN@[76; 77) ")"
-          SEMICOLON@[77; 78) ";"
-        WHITESPACE@[78; 83) "\n    "
-        LET_STMT@[83; 101)
-          LET_KW@[83; 86) "let"
-          WHITESPACE@[86; 87) " "
-          TUPLE_PAT@[87; 95)
-            L_PAREN@[87; 88) "("
-            BIND_PAT@[88; 89)
-              NAME@[88; 89)
-                IDENT@[88; 89) "a"
-            COMMA@[89; 90) ","
-            WHITESPACE@[90; 91) " "
-            DOT_DOT_PAT@[91; 93)
-              DOT2@[91; 93) ".."
-            COMMA@[93; 94) ","
-            R_PAREN@[94; 95) ")"
-          WHITESPACE@[95; 96) " "
-          EQ@[96; 97) "="
-          WHITESPACE@[97; 98) " "
-          TUPLE_EXPR@[98; 100)
-            L_PAREN@[98; 99) "("
-            R_PAREN@[99; 100) ")"
-          SEMICOLON@[100; 101) ";"
-        WHITESPACE@[101; 106) "\n    "
-        LET_STMT@[106; 128)
-          LET_KW@[106; 109) "let"
-          WHITESPACE@[109; 110) " "
-          TUPLE_STRUCT_PAT@[110; 122)
-            PATH@[110; 115)
-              PATH_SEGMENT@[110; 115)
-                NAME_REF@[110; 115)
-                  IDENT@[110; 115) "Tuple"
-            L_PAREN@[115; 116) "("
-            BIND_PAT@[116; 117)
-              NAME@[116; 117)
-                IDENT@[116; 117) "a"
-            COMMA@[117; 118) ","
-            WHITESPACE@[118; 119) " "
-            DOT_DOT_PAT@[119; 121)
-              DOT2@[119; 121) ".."
-            R_PAREN@[121; 122) ")"
-          WHITESPACE@[122; 123) " "
-          EQ@[123; 124) "="
-          WHITESPACE@[124; 125) " "
-          TUPLE_EXPR@[125; 127)
-            L_PAREN@[125; 126) "("
-            R_PAREN@[126; 127) ")"
-          SEMICOLON@[127; 128) ";"
-        WHITESPACE@[128; 133) "\n    "
-        LET_STMT@[133; 156)
-          LET_KW@[133; 136) "let"
-          WHITESPACE@[136; 137) " "
-          TUPLE_STRUCT_PAT@[137; 150)
-            PATH@[137; 142)
-              PATH_SEGMENT@[137; 142)
-                NAME_REF@[137; 142)
-                  IDENT@[137; 142) "Tuple"
-            L_PAREN@[142; 143) "("
-            BIND_PAT@[143; 144)
-              NAME@[143; 144)
-                IDENT@[143; 144) "a"
-            COMMA@[144; 145) ","
-            WHITESPACE@[145; 146) " "
-            DOT_DOT_PAT@[146; 148)
-              DOT2@[146; 148) ".."
-            COMMA@[148; 149) ","
-            R_PAREN@[149; 150) ")"
-          WHITESPACE@[150; 151) " "
-          EQ@[151; 152) "="
-          WHITESPACE@[152; 153) " "
-          TUPLE_EXPR@[153; 155)
-            L_PAREN@[153; 154) "("
-            R_PAREN@[154; 155) ")"
-          SEMICOLON@[155; 156) ";"
-        WHITESPACE@[156; 161) "\n    "
-        LET_STMT@[161; 179)
-          LET_KW@[161; 164) "let"
-          WHITESPACE@[164; 165) " "
-          TUPLE_PAT@[165; 173)
-            L_PAREN@[165; 166) "("
-            DOT_DOT_PAT@[166; 168)
-              DOT2@[166; 168) ".."
-            COMMA@[168; 169) ","
-            WHITESPACE@[169; 170) " "
-            DOT_DOT_PAT@[170; 172)
-              DOT2@[170; 172) ".."
-            R_PAREN@[172; 173) ")"
-          WHITESPACE@[173; 174) " "
-          EQ@[174; 175) "="
-          WHITESPACE@[175; 176) " "
-          TUPLE_EXPR@[176; 178)
-            L_PAREN@[176; 177) "("
-            R_PAREN@[177; 178) ")"
-          SEMICOLON@[178; 179) ";"
-        WHITESPACE@[179; 184) "\n    "
-        LET_STMT@[184; 207)
-          LET_KW@[184; 187) "let"
-          WHITESPACE@[187; 188) " "
-          TUPLE_STRUCT_PAT@[188; 201)
-            PATH@[188; 193)
-              PATH_SEGMENT@[188; 193)
-                NAME_REF@[188; 193)
-                  IDENT@[188; 193) "Tuple"
-            L_PAREN@[193; 194) "("
-            DOT_DOT_PAT@[194; 196)
-              DOT2@[194; 196) ".."
-            COMMA@[196; 197) ","
-            WHITESPACE@[197; 198) " "
-            DOT_DOT_PAT@[198; 200)
-              DOT2@[198; 200) ".."
-            R_PAREN@[200; 201) ")"
-          WHITESPACE@[201; 202) " "
-          EQ@[202; 203) "="
-          WHITESPACE@[203; 204) " "
-          TUPLE_EXPR@[204; 206)
-            L_PAREN@[204; 205) "("
-            R_PAREN@[205; 206) ")"
-          SEMICOLON@[206; 207) ";"
-        WHITESPACE@[207; 212) "\n    "
-        LET_STMT@[212; 233)
-          LET_KW@[212; 215) "let"
-          WHITESPACE@[215; 216) " "
-          TUPLE_PAT@[216; 227)
-            L_PAREN@[216; 217) "("
-            DOT_DOT_PAT@[217; 219)
-              DOT2@[217; 219) ".."
-            COMMA@[219; 220) ","
-            WHITESPACE@[220; 221) " "
-            BIND_PAT@[221; 222)
-              NAME@[221; 222)
-                IDENT@[221; 222) "a"
-            COMMA@[222; 223) ","
-            WHITESPACE@[223; 224) " "
-            DOT_DOT_PAT@[224; 226)
-              DOT2@[224; 226) ".."
-            R_PAREN@[226; 227) ")"
-          WHITESPACE@[227; 228) " "
-          EQ@[228; 229) "="
-          WHITESPACE@[229; 230) " "
-          TUPLE_EXPR@[230; 232)
-            L_PAREN@[230; 231) "("
-            R_PAREN@[231; 232) ")"
-          SEMICOLON@[232; 233) ";"
-        WHITESPACE@[233; 238) "\n    "
-        LET_STMT@[238; 264)
-          LET_KW@[238; 241) "let"
-          WHITESPACE@[241; 242) " "
-          TUPLE_STRUCT_PAT@[242; 258)
-            PATH@[242; 247)
-              PATH_SEGMENT@[242; 247)
-                NAME_REF@[242; 247)
-                  IDENT@[242; 247) "Tuple"
-            L_PAREN@[247; 248) "("
-            DOT_DOT_PAT@[248; 250)
-              DOT2@[248; 250) ".."
-            COMMA@[250; 251) ","
-            WHITESPACE@[251; 252) " "
-            BIND_PAT@[252; 253)
-              NAME@[252; 253)
-                IDENT@[252; 253) "a"
-            COMMA@[253; 254) ","
-            WHITESPACE@[254; 255) " "
-            DOT_DOT_PAT@[255; 257)
-              DOT2@[255; 257) ".."
-            R_PAREN@[257; 258) ")"
-          WHITESPACE@[258; 259) " "
-          EQ@[259; 260) "="
-          WHITESPACE@[260; 261) " "
-          TUPLE_EXPR@[261; 263)
-            L_PAREN@[261; 262) "("
-            R_PAREN@[262; 263) ")"
-          SEMICOLON@[263; 264) ";"
-        WHITESPACE@[264; 269) "\n    "
-        COMMENT@[269; 271) "//"
-        WHITESPACE@[271; 276) "\n    "
-        COMMENT@[276; 285) "// Slices"
-        WHITESPACE@[285; 290) "\n    "
-        COMMENT@[290; 292) "//"
-        WHITESPACE@[292; 297) "\n    "
-        LET_STMT@[297; 311)
-          LET_KW@[297; 300) "let"
-          WHITESPACE@[300; 301) " "
-          SLICE_PAT@[301; 305)
-            L_BRACK@[301; 302) "["
-            DOT_DOT_PAT@[302; 304)
-              DOT2@[302; 304) ".."
-            R_BRACK@[304; 305) "]"
-          WHITESPACE@[305; 306) " "
-          EQ@[306; 307) "="
-          WHITESPACE@[307; 308) " "
-          TUPLE_EXPR@[308; 310)
-            L_PAREN@[308; 309) "("
-            R_PAREN@[309; 310) ")"
-          SEMICOLON@[310; 311) ";"
-        WHITESPACE@[311; 316) "\n    "
-        LET_STMT@[316; 336)
-          LET_KW@[316; 319) "let"
-          WHITESPACE@[319; 320) " "
-          SLICE_PAT@[320; 330)
-            L_BRACK@[320; 321) "["
-            BIND_PAT@[321; 325)
-              NAME@[321; 325)
-                IDENT@[321; 325) "head"
-            COMMA@[325; 326) ","
-            WHITESPACE@[326; 327) " "
-            DOT_DOT_PAT@[327; 329)
-              DOT2@[327; 329) ".."
-            R_BRACK@[329; 330) "]"
-          WHITESPACE@[330; 331) " "
-          EQ@[331; 332) "="
-          WHITESPACE@[332; 333) " "
-          TUPLE_EXPR@[333; 335)
-            L_PAREN@[333; 334) "("
-            R_PAREN@[334; 335) ")"
-          SEMICOLON@[335; 336) ";"
-        WHITESPACE@[336; 341) "\n    "
-        LET_STMT@[341; 368)
-          LET_KW@[341; 344) "let"
-          WHITESPACE@[344; 345) " "
-          SLICE_PAT@[345; 362)
-            L_BRACK@[345; 346) "["
-            BIND_PAT@[346; 350)
-              NAME@[346; 350)
-                IDENT@[346; 350) "head"
-            COMMA@[350; 351) ","
-            WHITESPACE@[351; 352) " "
-            BIND_PAT@[352; 361)
-              NAME@[352; 356)
-                IDENT@[352; 356) "tail"
-              WHITESPACE@[356; 357) " "
-              AT@[357; 358) "@"
-              WHITESPACE@[358; 359) " "
-              DOT_DOT_PAT@[359; 361)
-                DOT2@[359; 361) ".."
-            R_BRACK@[361; 362) "]"
-          WHITESPACE@[362; 363) " "
-          EQ@[363; 364) "="
-          WHITESPACE@[364; 365) " "
-          TUPLE_EXPR@[365; 367)
-            L_PAREN@[365; 366) "("
-            R_PAREN@[366; 367) ")"
-          SEMICOLON@[367; 368) ";"
-        WHITESPACE@[368; 373) "\n    "
-        LET_STMT@[373; 399)
-          LET_KW@[373; 376) "let"
-          WHITESPACE@[376; 377) " "
-          SLICE_PAT@[377; 393)
-            L_BRACK@[377; 378) "["
-            BIND_PAT@[378; 382)
-              NAME@[378; 382)
-                IDENT@[378; 382) "head"
-            COMMA@[382; 383) ","
-            WHITESPACE@[383; 384) " "
-            DOT_DOT_PAT@[384; 386)
-              DOT2@[384; 386) ".."
-            COMMA@[386; 387) ","
-            WHITESPACE@[387; 388) " "
-            BIND_PAT@[388; 392)
-              NAME@[388; 392)
-                IDENT@[388; 392) "cons"
-            R_BRACK@[392; 393) "]"
-          WHITESPACE@[393; 394) " "
-          EQ@[394; 395) "="
-          WHITESPACE@[395; 396) " "
-          TUPLE_EXPR@[396; 398)
-            L_PAREN@[396; 397) "("
-            R_PAREN@[397; 398) ")"
-          SEMICOLON@[398; 399) ";"
-        WHITESPACE@[399; 404) "\n    "
-        LET_STMT@[404; 436)
-          LET_KW@[404; 407) "let"
-          WHITESPACE@[407; 408) " "
-          SLICE_PAT@[408; 430)
-            L_BRACK@[408; 409) "["
-            BIND_PAT@[409; 413)
-              NAME@[409; 413)
-                IDENT@[409; 413) "head"
-            COMMA@[413; 414) ","
-            WHITESPACE@[414; 415) " "
-            BIND_PAT@[415; 423)
-              NAME@[415; 418)
-                IDENT@[415; 418) "mid"
-              WHITESPACE@[418; 419) " "
-              AT@[419; 420) "@"
-              WHITESPACE@[420; 421) " "
-              DOT_DOT_PAT@[421; 423)
-                DOT2@[421; 423) ".."
-            COMMA@[423; 424) ","
-            WHITESPACE@[424; 425) " "
-            BIND_PAT@[425; 429)
-              NAME@[425; 429)
-                IDENT@[425; 429) "cons"
-            R_BRACK@[429; 430) "]"
-          WHITESPACE@[430; 431) " "
-          EQ@[431; 432) "="
-          WHITESPACE@[432; 433) " "
-          TUPLE_EXPR@[433; 435)
-            L_PAREN@[433; 434) "("
-            R_PAREN@[434; 435) ")"
-          SEMICOLON@[435; 436) ";"
-        WHITESPACE@[436; 441) "\n    "
-        LET_STMT@[441; 471)
-          LET_KW@[441; 444) "let"
-          WHITESPACE@[444; 445) " "
-          SLICE_PAT@[445; 465)
-            L_BRACK@[445; 446) "["
-            BIND_PAT@[446; 450)
-              NAME@[446; 450)
-                IDENT@[446; 450) "head"
-            COMMA@[450; 451) ","
-            WHITESPACE@[451; 452) " "
-            DOT_DOT_PAT@[452; 454)
-              DOT2@[452; 454) ".."
-            COMMA@[454; 455) ","
-            WHITESPACE@[455; 456) " "
-            DOT_DOT_PAT@[456; 458)
-              DOT2@[456; 458) ".."
-            COMMA@[458; 459) ","
-            WHITESPACE@[459; 460) " "
-            BIND_PAT@[460; 464)
-              NAME@[460; 464)
-                IDENT@[460; 464) "cons"
-            R_BRACK@[464; 465) "]"
-          WHITESPACE@[465; 466) " "
-          EQ@[466; 467) "="
-          WHITESPACE@[467; 468) " "
-          TUPLE_EXPR@[468; 470)
-            L_PAREN@[468; 469) "("
-            R_PAREN@[469; 470) ")"
-          SEMICOLON@[470; 471) ";"
-        WHITESPACE@[471; 476) "\n    "
-        LET_STMT@[476; 512)
-          LET_KW@[476; 479) "let"
-          WHITESPACE@[479; 480) " "
-          SLICE_PAT@[480; 506)
-            L_BRACK@[480; 481) "["
-            BIND_PAT@[481; 485)
-              NAME@[481; 485)
-                IDENT@[481; 485) "head"
-            COMMA@[485; 486) ","
-            WHITESPACE@[486; 487) " "
-            DOT_DOT_PAT@[487; 489)
-              DOT2@[487; 489) ".."
-            COMMA@[489; 490) ","
-            WHITESPACE@[490; 491) " "
-            BIND_PAT@[491; 494)
-              NAME@[491; 494)
-                IDENT@[491; 494) "mid"
-            COMMA@[494; 495) ","
-            WHITESPACE@[495; 496) " "
-            BIND_PAT@[496; 505)
-              NAME@[496; 500)
-                IDENT@[496; 500) "tail"
-              WHITESPACE@[500; 501) " "
-              AT@[501; 502) "@"
-              WHITESPACE@[502; 503) " "
-              DOT_DOT_PAT@[503; 505)
-                DOT2@[503; 505) ".."
-            R_BRACK@[505; 506) "]"
-          WHITESPACE@[506; 507) " "
-          EQ@[507; 508) "="
-          WHITESPACE@[508; 509) " "
-          TUPLE_EXPR@[509; 511)
-            L_PAREN@[509; 510) "("
-            R_PAREN@[510; 511) ")"
-          SEMICOLON@[511; 512) ";"
-        WHITESPACE@[512; 517) "\n    "
-        LET_STMT@[517; 552)
-          LET_KW@[517; 520) "let"
-          WHITESPACE@[520; 521) " "
-          SLICE_PAT@[521; 546)
-            L_BRACK@[521; 522) "["
-            BIND_PAT@[522; 526)
-              NAME@[522; 526)
-                IDENT@[522; 526) "head"
-            COMMA@[526; 527) ","
-            WHITESPACE@[527; 528) " "
-            DOT_DOT_PAT@[528; 530)
-              DOT2@[528; 530) ".."
-            COMMA@[530; 531) ","
-            WHITESPACE@[531; 532) " "
-            BIND_PAT@[532; 535)
-              NAME@[532; 535)
-                IDENT@[532; 535) "mid"
-            COMMA@[535; 536) ","
-            WHITESPACE@[536; 537) " "
-            DOT_DOT_PAT@[537; 539)
-              DOT2@[537; 539) ".."
-            COMMA@[539; 540) ","
-            WHITESPACE@[540; 541) " "
-            BIND_PAT@[541; 545)
-              NAME@[541; 545)
-                IDENT@[541; 545) "cons"
-            R_BRACK@[545; 546) "]"
-          WHITESPACE@[546; 547) " "
-          EQ@[547; 548) "="
-          WHITESPACE@[548; 549) " "
-          TUPLE_EXPR@[549; 551)
-            L_PAREN@[549; 550) "("
-            R_PAREN@[550; 551) ")"
-          SEMICOLON@[551; 552) ";"
-        WHITESPACE@[552; 553) "\n"
-        R_CURLY@[553; 554) "}"
-  WHITESPACE@[554; 555) "\n"
+SOURCE_FILE@0..555
+  FN_DEF@0..554
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..554
+      BLOCK@10..554
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        LET_STMT@16..28
+          LET_KW@16..19 "let"
+          WHITESPACE@19..20 " "
+          DOT_DOT_PAT@20..22
+            DOT2@20..22 ".."
+          WHITESPACE@22..23 " "
+          EQ@23..24 "="
+          WHITESPACE@24..25 " "
+          TUPLE_EXPR@25..27
+            L_PAREN@25..26 "("
+            R_PAREN@26..27 ")"
+          SEMICOLON@27..28 ";"
+        WHITESPACE@28..33 "\n    "
+        COMMENT@33..35 "//"
+        WHITESPACE@35..40 "\n    "
+        COMMENT@40..49 "// Tuples"
+        WHITESPACE@49..54 "\n    "
+        COMMENT@54..56 "//"
+        WHITESPACE@56..61 "\n    "
+        LET_STMT@61..78
+          LET_KW@61..64 "let"
+          WHITESPACE@64..65 " "
+          TUPLE_PAT@65..72
+            L_PAREN@65..66 "("
+            BIND_PAT@66..67
+              NAME@66..67
+                IDENT@66..67 "a"
+            COMMA@67..68 ","
+            WHITESPACE@68..69 " "
+            DOT_DOT_PAT@69..71
+              DOT2@69..71 ".."
+            R_PAREN@71..72 ")"
+          WHITESPACE@72..73 " "
+          EQ@73..74 "="
+          WHITESPACE@74..75 " "
+          TUPLE_EXPR@75..77
+            L_PAREN@75..76 "("
+            R_PAREN@76..77 ")"
+          SEMICOLON@77..78 ";"
+        WHITESPACE@78..83 "\n    "
+        LET_STMT@83..101
+          LET_KW@83..86 "let"
+          WHITESPACE@86..87 " "
+          TUPLE_PAT@87..95
+            L_PAREN@87..88 "("
+            BIND_PAT@88..89
+              NAME@88..89
+                IDENT@88..89 "a"
+            COMMA@89..90 ","
+            WHITESPACE@90..91 " "
+            DOT_DOT_PAT@91..93
+              DOT2@91..93 ".."
+            COMMA@93..94 ","
+            R_PAREN@94..95 ")"
+          WHITESPACE@95..96 " "
+          EQ@96..97 "="
+          WHITESPACE@97..98 " "
+          TUPLE_EXPR@98..100
+            L_PAREN@98..99 "("
+            R_PAREN@99..100 ")"
+          SEMICOLON@100..101 ";"
+        WHITESPACE@101..106 "\n    "
+        LET_STMT@106..128
+          LET_KW@106..109 "let"
+          WHITESPACE@109..110 " "
+          TUPLE_STRUCT_PAT@110..122
+            PATH@110..115
+              PATH_SEGMENT@110..115
+                NAME_REF@110..115
+                  IDENT@110..115 "Tuple"
+            L_PAREN@115..116 "("
+            BIND_PAT@116..117
+              NAME@116..117
+                IDENT@116..117 "a"
+            COMMA@117..118 ","
+            WHITESPACE@118..119 " "
+            DOT_DOT_PAT@119..121
+              DOT2@119..121 ".."
+            R_PAREN@121..122 ")"
+          WHITESPACE@122..123 " "
+          EQ@123..124 "="
+          WHITESPACE@124..125 " "
+          TUPLE_EXPR@125..127
+            L_PAREN@125..126 "("
+            R_PAREN@126..127 ")"
+          SEMICOLON@127..128 ";"
+        WHITESPACE@128..133 "\n    "
+        LET_STMT@133..156
+          LET_KW@133..136 "let"
+          WHITESPACE@136..137 " "
+          TUPLE_STRUCT_PAT@137..150
+            PATH@137..142
+              PATH_SEGMENT@137..142
+                NAME_REF@137..142
+                  IDENT@137..142 "Tuple"
+            L_PAREN@142..143 "("
+            BIND_PAT@143..144
+              NAME@143..144
+                IDENT@143..144 "a"
+            COMMA@144..145 ","
+            WHITESPACE@145..146 " "
+            DOT_DOT_PAT@146..148
+              DOT2@146..148 ".."
+            COMMA@148..149 ","
+            R_PAREN@149..150 ")"
+          WHITESPACE@150..151 " "
+          EQ@151..152 "="
+          WHITESPACE@152..153 " "
+          TUPLE_EXPR@153..155
+            L_PAREN@153..154 "("
+            R_PAREN@154..155 ")"
+          SEMICOLON@155..156 ";"
+        WHITESPACE@156..161 "\n    "
+        LET_STMT@161..179
+          LET_KW@161..164 "let"
+          WHITESPACE@164..165 " "
+          TUPLE_PAT@165..173
+            L_PAREN@165..166 "("
+            DOT_DOT_PAT@166..168
+              DOT2@166..168 ".."
+            COMMA@168..169 ","
+            WHITESPACE@169..170 " "
+            DOT_DOT_PAT@170..172
+              DOT2@170..172 ".."
+            R_PAREN@172..173 ")"
+          WHITESPACE@173..174 " "
+          EQ@174..175 "="
+          WHITESPACE@175..176 " "
+          TUPLE_EXPR@176..178
+            L_PAREN@176..177 "("
+            R_PAREN@177..178 ")"
+          SEMICOLON@178..179 ";"
+        WHITESPACE@179..184 "\n    "
+        LET_STMT@184..207
+          LET_KW@184..187 "let"
+          WHITESPACE@187..188 " "
+          TUPLE_STRUCT_PAT@188..201
+            PATH@188..193
+              PATH_SEGMENT@188..193
+                NAME_REF@188..193
+                  IDENT@188..193 "Tuple"
+            L_PAREN@193..194 "("
+            DOT_DOT_PAT@194..196
+              DOT2@194..196 ".."
+            COMMA@196..197 ","
+            WHITESPACE@197..198 " "
+            DOT_DOT_PAT@198..200
+              DOT2@198..200 ".."
+            R_PAREN@200..201 ")"
+          WHITESPACE@201..202 " "
+          EQ@202..203 "="
+          WHITESPACE@203..204 " "
+          TUPLE_EXPR@204..206
+            L_PAREN@204..205 "("
+            R_PAREN@205..206 ")"
+          SEMICOLON@206..207 ";"
+        WHITESPACE@207..212 "\n    "
+        LET_STMT@212..233
+          LET_KW@212..215 "let"
+          WHITESPACE@215..216 " "
+          TUPLE_PAT@216..227
+            L_PAREN@216..217 "("
+            DOT_DOT_PAT@217..219
+              DOT2@217..219 ".."
+            COMMA@219..220 ","
+            WHITESPACE@220..221 " "
+            BIND_PAT@221..222
+              NAME@221..222
+                IDENT@221..222 "a"
+            COMMA@222..223 ","
+            WHITESPACE@223..224 " "
+            DOT_DOT_PAT@224..226
+              DOT2@224..226 ".."
+            R_PAREN@226..227 ")"
+          WHITESPACE@227..228 " "
+          EQ@228..229 "="
+          WHITESPACE@229..230 " "
+          TUPLE_EXPR@230..232
+            L_PAREN@230..231 "("
+            R_PAREN@231..232 ")"
+          SEMICOLON@232..233 ";"
+        WHITESPACE@233..238 "\n    "
+        LET_STMT@238..264
+          LET_KW@238..241 "let"
+          WHITESPACE@241..242 " "
+          TUPLE_STRUCT_PAT@242..258
+            PATH@242..247
+              PATH_SEGMENT@242..247
+                NAME_REF@242..247
+                  IDENT@242..247 "Tuple"
+            L_PAREN@247..248 "("
+            DOT_DOT_PAT@248..250
+              DOT2@248..250 ".."
+            COMMA@250..251 ","
+            WHITESPACE@251..252 " "
+            BIND_PAT@252..253
+              NAME@252..253
+                IDENT@252..253 "a"
+            COMMA@253..254 ","
+            WHITESPACE@254..255 " "
+            DOT_DOT_PAT@255..257
+              DOT2@255..257 ".."
+            R_PAREN@257..258 ")"
+          WHITESPACE@258..259 " "
+          EQ@259..260 "="
+          WHITESPACE@260..261 " "
+          TUPLE_EXPR@261..263
+            L_PAREN@261..262 "("
+            R_PAREN@262..263 ")"
+          SEMICOLON@263..264 ";"
+        WHITESPACE@264..269 "\n    "
+        COMMENT@269..271 "//"
+        WHITESPACE@271..276 "\n    "
+        COMMENT@276..285 "// Slices"
+        WHITESPACE@285..290 "\n    "
+        COMMENT@290..292 "//"
+        WHITESPACE@292..297 "\n    "
+        LET_STMT@297..311
+          LET_KW@297..300 "let"
+          WHITESPACE@300..301 " "
+          SLICE_PAT@301..305
+            L_BRACK@301..302 "["
+            DOT_DOT_PAT@302..304
+              DOT2@302..304 ".."
+            R_BRACK@304..305 "]"
+          WHITESPACE@305..306 " "
+          EQ@306..307 "="
+          WHITESPACE@307..308 " "
+          TUPLE_EXPR@308..310
+            L_PAREN@308..309 "("
+            R_PAREN@309..310 ")"
+          SEMICOLON@310..311 ";"
+        WHITESPACE@311..316 "\n    "
+        LET_STMT@316..336
+          LET_KW@316..319 "let"
+          WHITESPACE@319..320 " "
+          SLICE_PAT@320..330
+            L_BRACK@320..321 "["
+            BIND_PAT@321..325
+              NAME@321..325
+                IDENT@321..325 "head"
+            COMMA@325..326 ","
+            WHITESPACE@326..327 " "
+            DOT_DOT_PAT@327..329
+              DOT2@327..329 ".."
+            R_BRACK@329..330 "]"
+          WHITESPACE@330..331 " "
+          EQ@331..332 "="
+          WHITESPACE@332..333 " "
+          TUPLE_EXPR@333..335
+            L_PAREN@333..334 "("
+            R_PAREN@334..335 ")"
+          SEMICOLON@335..336 ";"
+        WHITESPACE@336..341 "\n    "
+        LET_STMT@341..368
+          LET_KW@341..344 "let"
+          WHITESPACE@344..345 " "
+          SLICE_PAT@345..362
+            L_BRACK@345..346 "["
+            BIND_PAT@346..350
+              NAME@346..350
+                IDENT@346..350 "head"
+            COMMA@350..351 ","
+            WHITESPACE@351..352 " "
+            BIND_PAT@352..361
+              NAME@352..356
+                IDENT@352..356 "tail"
+              WHITESPACE@356..357 " "
+              AT@357..358 "@"
+              WHITESPACE@358..359 " "
+              DOT_DOT_PAT@359..361
+                DOT2@359..361 ".."
+            R_BRACK@361..362 "]"
+          WHITESPACE@362..363 " "
+          EQ@363..364 "="
+          WHITESPACE@364..365 " "
+          TUPLE_EXPR@365..367
+            L_PAREN@365..366 "("
+            R_PAREN@366..367 ")"
+          SEMICOLON@367..368 ";"
+        WHITESPACE@368..373 "\n    "
+        LET_STMT@373..399
+          LET_KW@373..376 "let"
+          WHITESPACE@376..377 " "
+          SLICE_PAT@377..393
+            L_BRACK@377..378 "["
+            BIND_PAT@378..382
+              NAME@378..382
+                IDENT@378..382 "head"
+            COMMA@382..383 ","
+            WHITESPACE@383..384 " "
+            DOT_DOT_PAT@384..386
+              DOT2@384..386 ".."
+            COMMA@386..387 ","
+            WHITESPACE@387..388 " "
+            BIND_PAT@388..392
+              NAME@388..392
+                IDENT@388..392 "cons"
+            R_BRACK@392..393 "]"
+          WHITESPACE@393..394 " "
+          EQ@394..395 "="
+          WHITESPACE@395..396 " "
+          TUPLE_EXPR@396..398
+            L_PAREN@396..397 "("
+            R_PAREN@397..398 ")"
+          SEMICOLON@398..399 ";"
+        WHITESPACE@399..404 "\n    "
+        LET_STMT@404..436
+          LET_KW@404..407 "let"
+          WHITESPACE@407..408 " "
+          SLICE_PAT@408..430
+            L_BRACK@408..409 "["
+            BIND_PAT@409..413
+              NAME@409..413
+                IDENT@409..413 "head"
+            COMMA@413..414 ","
+            WHITESPACE@414..415 " "
+            BIND_PAT@415..423
+              NAME@415..418
+                IDENT@415..418 "mid"
+              WHITESPACE@418..419 " "
+              AT@419..420 "@"
+              WHITESPACE@420..421 " "
+              DOT_DOT_PAT@421..423
+                DOT2@421..423 ".."
+            COMMA@423..424 ","
+            WHITESPACE@424..425 " "
+            BIND_PAT@425..429
+              NAME@425..429
+                IDENT@425..429 "cons"
+            R_BRACK@429..430 "]"
+          WHITESPACE@430..431 " "
+          EQ@431..432 "="
+          WHITESPACE@432..433 " "
+          TUPLE_EXPR@433..435
+            L_PAREN@433..434 "("
+            R_PAREN@434..435 ")"
+          SEMICOLON@435..436 ";"
+        WHITESPACE@436..441 "\n    "
+        LET_STMT@441..471
+          LET_KW@441..444 "let"
+          WHITESPACE@444..445 " "
+          SLICE_PAT@445..465
+            L_BRACK@445..446 "["
+            BIND_PAT@446..450
+              NAME@446..450
+                IDENT@446..450 "head"
+            COMMA@450..451 ","
+            WHITESPACE@451..452 " "
+            DOT_DOT_PAT@452..454
+              DOT2@452..454 ".."
+            COMMA@454..455 ","
+            WHITESPACE@455..456 " "
+            DOT_DOT_PAT@456..458
+              DOT2@456..458 ".."
+            COMMA@458..459 ","
+            WHITESPACE@459..460 " "
+            BIND_PAT@460..464
+              NAME@460..464
+                IDENT@460..464 "cons"
+            R_BRACK@464..465 "]"
+          WHITESPACE@465..466 " "
+          EQ@466..467 "="
+          WHITESPACE@467..468 " "
+          TUPLE_EXPR@468..470
+            L_PAREN@468..469 "("
+            R_PAREN@469..470 ")"
+          SEMICOLON@470..471 ";"
+        WHITESPACE@471..476 "\n    "
+        LET_STMT@476..512
+          LET_KW@476..479 "let"
+          WHITESPACE@479..480 " "
+          SLICE_PAT@480..506
+            L_BRACK@480..481 "["
+            BIND_PAT@481..485
+              NAME@481..485
+                IDENT@481..485 "head"
+            COMMA@485..486 ","
+            WHITESPACE@486..487 " "
+            DOT_DOT_PAT@487..489
+              DOT2@487..489 ".."
+            COMMA@489..490 ","
+            WHITESPACE@490..491 " "
+            BIND_PAT@491..494
+              NAME@491..494
+                IDENT@491..494 "mid"
+            COMMA@494..495 ","
+            WHITESPACE@495..496 " "
+            BIND_PAT@496..505
+              NAME@496..500
+                IDENT@496..500 "tail"
+              WHITESPACE@500..501 " "
+              AT@501..502 "@"
+              WHITESPACE@502..503 " "
+              DOT_DOT_PAT@503..505
+                DOT2@503..505 ".."
+            R_BRACK@505..506 "]"
+          WHITESPACE@506..507 " "
+          EQ@507..508 "="
+          WHITESPACE@508..509 " "
+          TUPLE_EXPR@509..511
+            L_PAREN@509..510 "("
+            R_PAREN@510..511 ")"
+          SEMICOLON@511..512 ";"
+        WHITESPACE@512..517 "\n    "
+        LET_STMT@517..552
+          LET_KW@517..520 "let"
+          WHITESPACE@520..521 " "
+          SLICE_PAT@521..546
+            L_BRACK@521..522 "["
+            BIND_PAT@522..526
+              NAME@522..526
+                IDENT@522..526 "head"
+            COMMA@526..527 ","
+            WHITESPACE@527..528 " "
+            DOT_DOT_PAT@528..530
+              DOT2@528..530 ".."
+            COMMA@530..531 ","
+            WHITESPACE@531..532 " "
+            BIND_PAT@532..535
+              NAME@532..535
+                IDENT@532..535 "mid"
+            COMMA@535..536 ","
+            WHITESPACE@536..537 " "
+            DOT_DOT_PAT@537..539
+              DOT2@537..539 ".."
+            COMMA@539..540 ","
+            WHITESPACE@540..541 " "
+            BIND_PAT@541..545
+              NAME@541..545
+                IDENT@541..545 "cons"
+            R_BRACK@545..546 "]"
+          WHITESPACE@546..547 " "
+          EQ@547..548 "="
+          WHITESPACE@548..549 " "
+          TUPLE_EXPR@549..551
+            L_PAREN@549..550 "("
+            R_PAREN@550..551 ")"
+          SEMICOLON@551..552 ";"
+        WHITESPACE@552..553 "\n"
+        R_CURLY@553..554 "}"
+  WHITESPACE@554..555 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
index cac2ffdcf..10434b637 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
@@ -1,76 +1,76 @@
-SOURCE_FILE@[0; 63)
-  FN_DEF@[0; 62)
-    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; 62)
-      BLOCK@[9; 62)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 35)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          RECORD_PAT@[19; 29)
-            PATH@[19; 20)
-              PATH_SEGMENT@[19; 20)
-                NAME_REF@[19; 20)
-                  IDENT@[19; 20) "S"
-            WHITESPACE@[20; 21) " "
-            RECORD_FIELD_PAT_LIST@[21; 29)
-              L_CURLY@[21; 22) "{"
-              WHITESPACE@[22; 23) " "
-              RECORD_FIELD_PAT@[23; 27)
-                NAME_REF@[23; 24)
-                  INT_NUMBER@[23; 24) "0"
-                COLON@[24; 25) ":"
-                WHITESPACE@[25; 26) " "
-                LITERAL_PAT@[26; 27)
-                  LITERAL@[26; 27)
-                    INT_NUMBER@[26; 27) "1"
-              WHITESPACE@[27; 28) " "
-              R_CURLY@[28; 29) "}"
-          WHITESPACE@[29; 30) " "
-          EQ@[30; 31) "="
-          WHITESPACE@[31; 32) " "
-          TUPLE_EXPR@[32; 34)
-            L_PAREN@[32; 33) "("
-            R_PAREN@[33; 34) ")"
-          SEMICOLON@[34; 35) ";"
-        WHITESPACE@[35; 40) "\n    "
-        LET_STMT@[40; 60)
-          LET_KW@[40; 43) "let"
-          WHITESPACE@[43; 44) " "
-          RECORD_PAT@[44; 54)
-            PATH@[44; 45)
-              PATH_SEGMENT@[44; 45)
-                NAME_REF@[44; 45)
-                  IDENT@[44; 45) "S"
-            WHITESPACE@[45; 46) " "
-            RECORD_FIELD_PAT_LIST@[46; 54)
-              L_CURLY@[46; 47) "{"
-              WHITESPACE@[47; 48) " "
-              RECORD_FIELD_PAT@[48; 52)
-                NAME_REF@[48; 49)
-                  IDENT@[48; 49) "x"
-                COLON@[49; 50) ":"
-                WHITESPACE@[50; 51) " "
-                LITERAL_PAT@[51; 52)
-                  LITERAL@[51; 52)
-                    INT_NUMBER@[51; 52) "1"
-              WHITESPACE@[52; 53) " "
-              R_CURLY@[53; 54) "}"
-          WHITESPACE@[54; 55) " "
-          EQ@[55; 56) "="
-          WHITESPACE@[56; 57) " "
-          TUPLE_EXPR@[57; 59)
-            L_PAREN@[57; 58) "("
-            R_PAREN@[58; 59) ")"
-          SEMICOLON@[59; 60) ";"
-        WHITESPACE@[60; 61) "\n"
-        R_CURLY@[61; 62) "}"
-  WHITESPACE@[62; 63) "\n"
+SOURCE_FILE@0..63
+  FN_DEF@0..62
+    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..62
+      BLOCK@9..62
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..35
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          RECORD_PAT@19..29
+            PATH@19..20
+              PATH_SEGMENT@19..20
+                NAME_REF@19..20
+                  IDENT@19..20 "S"
+            WHITESPACE@20..21 " "
+            RECORD_FIELD_PAT_LIST@21..29
+              L_CURLY@21..22 "{"
+              WHITESPACE@22..23 " "
+              RECORD_FIELD_PAT@23..27
+                NAME_REF@23..24
+                  INT_NUMBER@23..24 "0"
+                COLON@24..25 ":"
+                WHITESPACE@25..26 " "
+                LITERAL_PAT@26..27
+                  LITERAL@26..27
+                    INT_NUMBER@26..27 "1"
+              WHITESPACE@27..28 " "
+              R_CURLY@28..29 "}"
+          WHITESPACE@29..30 " "
+          EQ@30..31 "="
+          WHITESPACE@31..32 " "
+          TUPLE_EXPR@32..34
+            L_PAREN@32..33 "("
+            R_PAREN@33..34 ")"
+          SEMICOLON@34..35 ";"
+        WHITESPACE@35..40 "\n    "
+        LET_STMT@40..60
+          LET_KW@40..43 "let"
+          WHITESPACE@43..44 " "
+          RECORD_PAT@44..54
+            PATH@44..45
+              PATH_SEGMENT@44..45
+                NAME_REF@44..45
+                  IDENT@44..45 "S"
+            WHITESPACE@45..46 " "
+            RECORD_FIELD_PAT_LIST@46..54
+              L_CURLY@46..47 "{"
+              WHITESPACE@47..48 " "
+              RECORD_FIELD_PAT@48..52
+                NAME_REF@48..49
+                  IDENT@48..49 "x"
+                COLON@49..50 ":"
+                WHITESPACE@50..51 " "
+                LITERAL_PAT@51..52
+                  LITERAL@51..52
+                    INT_NUMBER@51..52 "1"
+              WHITESPACE@52..53 " "
+              R_CURLY@53..54 "}"
+          WHITESPACE@54..55 " "
+          EQ@55..56 "="
+          WHITESPACE@56..57 " "
+          TUPLE_EXPR@57..59
+            L_PAREN@57..58 "("
+            R_PAREN@58..59 ")"
+          SEMICOLON@59..60 ";"
+        WHITESPACE@60..61 "\n"
+        R_CURLY@61..62 "}"
+  WHITESPACE@62..63 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
index d2f6d8fde..66ad546b9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
@@ -1,43 +1,43 @@
-SOURCE_FILE@[0; 43)
-  FN_DEF@[0; 42)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 8)
-      L_PAREN@[6; 7) "("
-      R_PAREN@[7; 8) ")"
-    WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 42)
-      BLOCK@[9; 42)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        LET_STMT@[15; 40)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          PLACEHOLDER_PAT@[19; 20)
-            UNDERSCORE@[19; 20) "_"
-          WHITESPACE@[20; 21) " "
-          EQ@[21; 22) "="
-          WHITESPACE@[22; 23) " "
-          CAST_EXPR@[23; 39)
-            REF_EXPR@[23; 25)
-              AMP@[23; 24) "&"
-              LITERAL@[24; 25)
-                INT_NUMBER@[24; 25) "1"
-            WHITESPACE@[25; 26) " "
-            AS_KW@[26; 28) "as"
-            WHITESPACE@[28; 29) " "
-            POINTER_TYPE@[29; 39)
-              STAR@[29; 30) "*"
-              CONST_KW@[30; 35) "const"
-              WHITESPACE@[35; 36) " "
-              PATH_TYPE@[36; 39)
-                PATH@[36; 39)
-                  PATH_SEGMENT@[36; 39)
-                    NAME_REF@[36; 39)
-                      IDENT@[36; 39) "i32"
-          SEMICOLON@[39; 40) ";"
-        WHITESPACE@[40; 41) "\n"
-        R_CURLY@[41; 42) "}"
-  WHITESPACE@[42; 43) "\n"
+SOURCE_FILE@0..43
+  FN_DEF@0..42
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..8
+      L_PAREN@6..7 "("
+      R_PAREN@7..8 ")"
+    WHITESPACE@8..9 " "
+    BLOCK_EXPR@9..42
+      BLOCK@9..42
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        LET_STMT@15..40
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          PLACEHOLDER_PAT@19..20
+            UNDERSCORE@19..20 "_"
+          WHITESPACE@20..21 " "
+          EQ@21..22 "="
+          WHITESPACE@22..23 " "
+          CAST_EXPR@23..39
+            REF_EXPR@23..25
+              AMP@23..24 "&"
+              LITERAL@24..25
+                INT_NUMBER@24..25 "1"
+            WHITESPACE@25..26 " "
+            AS_KW@26..28 "as"
+            WHITESPACE@28..29 " "
+            POINTER_TYPE@29..39
+              STAR@29..30 "*"
+              CONST_KW@30..35 "const"
+              WHITESPACE@35..36 " "
+              PATH_TYPE@36..39
+                PATH@36..39
+                  PATH_SEGMENT@36..39
+                    NAME_REF@36..39
+                      IDENT@36..39 "i32"
+          SEMICOLON@39..40 ";"
+        WHITESPACE@40..41 "\n"
+        R_CURLY@41..42 "}"
+  WHITESPACE@42..43 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
index 21161f7bf..4b9b8e0ab 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
@@ -1,23 +1,23 @@
-SOURCE_FILE@[0; 24)
-  STRUCT_DEF@[0; 23)
-    STRUCT_KW@[0; 6) "struct"
-    WHITESPACE@[6; 7) " "
-    NAME@[7; 8)
-      IDENT@[7; 8) "S"
-    TYPE_PARAM_LIST@[8; 22)
-      L_ANGLE@[8; 9) "<"
-      CONST_PARAM@[9; 21)
-        CONST_KW@[9; 14) "const"
-        WHITESPACE@[14; 15) " "
-        NAME@[15; 16)
-          IDENT@[15; 16) "N"
-        COLON@[16; 17) ":"
-        WHITESPACE@[17; 18) " "
-        PATH_TYPE@[18; 21)
-          PATH@[18; 21)
-            PATH_SEGMENT@[18; 21)
-              NAME_REF@[18; 21)
-                IDENT@[18; 21) "u32"
-      R_ANGLE@[21; 22) ">"
-    SEMICOLON@[22; 23) ";"
-  WHITESPACE@[23; 24) "\n"
+SOURCE_FILE@0..24
+  STRUCT_DEF@0..23
+    STRUCT_KW@0..6 "struct"
+    WHITESPACE@6..7 " "
+    NAME@7..8
+      IDENT@7..8 "S"
+    TYPE_PARAM_LIST@8..22
+      L_ANGLE@8..9 "<"
+      CONST_PARAM@9..21
+        CONST_KW@9..14 "const"
+        WHITESPACE@14..15 " "
+        NAME@15..16
+          IDENT@15..16 "N"
+        COLON@16..17 ":"
+        WHITESPACE@17..18 " "
+        PATH_TYPE@18..21
+          PATH@18..21
+            PATH_SEGMENT@18..21
+              NAME_REF@18..21
+                IDENT@18..21 "u32"
+      R_ANGLE@21..22 ">"
+    SEMICOLON@22..23 ";"
+  WHITESPACE@23..24 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast
index 3556099bd..6655aeab1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast
@@ -1,45 +1,45 @@
-SOURCE_FILE@[0; 50)
-  MACRO_DEF@[0; 28)
-    MACRO_KW@[0; 5) "macro"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 7)
-      IDENT@[6; 7) "m"
-    WHITESPACE@[7; 8) " "
-    TOKEN_TREE@[8; 28)
-      L_CURLY@[8; 9) "{"
-      WHITESPACE@[9; 10) " "
-      TOKEN_TREE@[10; 20)
-        L_PAREN@[10; 11) "("
-        DOLLAR@[11; 12) "$"
-        IDENT@[12; 13) "i"
-        COLON@[13; 14) ":"
-        IDENT@[14; 19) "ident"
-        R_PAREN@[19; 20) ")"
-      WHITESPACE@[20; 21) " "
-      EQ@[21; 22) "="
-      R_ANGLE@[22; 23) ">"
-      WHITESPACE@[23; 24) " "
-      TOKEN_TREE@[24; 26)
-        L_CURLY@[24; 25) "{"
-        R_CURLY@[25; 26) "}"
-      WHITESPACE@[26; 27) " "
-      R_CURLY@[27; 28) "}"
-  WHITESPACE@[28; 29) "\n"
-  MACRO_DEF@[29; 49)
-    MACRO_KW@[29; 34) "macro"
-    WHITESPACE@[34; 35) " "
-    NAME@[35; 36)
-      IDENT@[35; 36) "m"
-    TOKEN_TREE@[36; 49)
-      TOKEN_TREE@[36; 46)
-        L_PAREN@[36; 37) "("
-        DOLLAR@[37; 38) "$"
-        IDENT@[38; 39) "i"
-        COLON@[39; 40) ":"
-        IDENT@[40; 45) "ident"
-        R_PAREN@[45; 46) ")"
-      WHITESPACE@[46; 47) " "
-      TOKEN_TREE@[47; 49)
-        L_CURLY@[47; 48) "{"
-        R_CURLY@[48; 49) "}"
-  WHITESPACE@[49; 50) "\n"
+SOURCE_FILE@0..50
+  MACRO_DEF@0..28
+    MACRO_KW@0..5 "macro"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "m"
+    WHITESPACE@7..8 " "
+    TOKEN_TREE@8..28
+      L_CURLY@8..9 "{"
+      WHITESPACE@9..10 " "
+      TOKEN_TREE@10..20
+        L_PAREN@10..11 "("
+        DOLLAR@11..12 "$"
+        IDENT@12..13 "i"
+        COLON@13..14 ":"
+        IDENT@14..19 "ident"
+        R_PAREN@19..20 ")"
+      WHITESPACE@20..21 " "
+      EQ@21..22 "="
+      R_ANGLE@22..23 ">"
+      WHITESPACE@23..24 " "
+      TOKEN_TREE@24..26
+        L_CURLY@24..25 "{"
+        R_CURLY@25..26 "}"
+      WHITESPACE@26..27 " "
+      R_CURLY@27..28 "}"
+  WHITESPACE@28..29 "\n"
+  MACRO_DEF@29..49
+    MACRO_KW@29..34 "macro"
+    WHITESPACE@34..35 " "
+    NAME@35..36
+      IDENT@35..36 "m"
+    TOKEN_TREE@36..49
+      TOKEN_TREE@36..46
+        L_PAREN@36..37 "("
+        DOLLAR@37..38 "$"
+        IDENT@38..39 "i"
+        COLON@39..40 ":"
+        IDENT@40..45 "ident"
+        R_PAREN@45..46 ")"
+      WHITESPACE@46..47 " "
+      TOKEN_TREE@47..49
+        L_CURLY@47..48 "{"
+        R_CURLY@48..49 "}"
+  WHITESPACE@49..50 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
index cfd79d9c2..1c527f60b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
@@ -1,21 +1,21 @@
-SOURCE_FILE@[0; 24)
-  MACRO_DEF@[0; 23)
-    VISIBILITY@[0; 3)
-      PUB_KW@[0; 3) "pub"
-    WHITESPACE@[3; 4) " "
-    MACRO_KW@[4; 9) "macro"
-    WHITESPACE@[9; 10) " "
-    NAME@[10; 11)
-      IDENT@[10; 11) "m"
-    TOKEN_TREE@[11; 23)
-      TOKEN_TREE@[11; 20)
-        L_PAREN@[11; 12) "("
-        DOLLAR@[12; 13) "$"
-        COLON@[13; 14) ":"
-        IDENT@[14; 19) "ident"
-        R_PAREN@[19; 20) ")"
-      WHITESPACE@[20; 21) " "
-      TOKEN_TREE@[21; 23)
-        L_CURLY@[21; 22) "{"
-        R_CURLY@[22; 23) "}"
-  WHITESPACE@[23; 24) "\n"
+SOURCE_FILE@0..24
+  MACRO_DEF@0..23
+    VISIBILITY@0..3
+      PUB_KW@0..3 "pub"
+    WHITESPACE@3..4 " "
+    MACRO_KW@4..9 "macro"
+    WHITESPACE@9..10 " "
+    NAME@10..11
+      IDENT@10..11 "m"
+    TOKEN_TREE@11..23
+      TOKEN_TREE@11..20
+        L_PAREN@11..12 "("
+        DOLLAR@12..13 "$"
+        COLON@13..14 ":"
+        IDENT@14..19 "ident"
+        R_PAREN@19..20 ")"
+      WHITESPACE@20..21 " "
+      TOKEN_TREE@21..23
+        L_CURLY@21..22 "{"
+        R_CURLY@22..23 "}"
+  WHITESPACE@23..24 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
index 1f297e479..3c00a2647 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
@@ -1,47 +1,47 @@
-SOURCE_FILE@[0; 40)
-  CONST_DEF@[0; 39)
-    CONST_KW@[0; 5) "const"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 7)
-      IDENT@[6; 7) "A"
-    COLON@[7; 8) ":"
-    WHITESPACE@[8; 9) " "
-    REFERENCE_TYPE@[9; 15)
-      AMP@[9; 10) "&"
-      SLICE_TYPE@[10; 15)
-        L_BRACK@[10; 11) "["
-        PATH_TYPE@[11; 14)
-          PATH@[11; 14)
-            PATH_SEGMENT@[11; 14)
-              NAME_REF@[11; 14)
-                IDENT@[11; 14) "i64"
-        R_BRACK@[14; 15) "]"
-    WHITESPACE@[15; 16) " "
-    EQ@[16; 17) "="
-    WHITESPACE@[17; 18) " "
-    REF_EXPR@[18; 38)
-      AMP@[18; 19) "&"
-      ARRAY_EXPR@[19; 38)
-        L_BRACK@[19; 20) "["
-        LITERAL@[20; 21)
-          INT_NUMBER@[20; 21) "1"
-        COMMA@[21; 22) ","
-        WHITESPACE@[22; 23) " "
-        LITERAL@[23; 37)
-          ATTR@[23; 35)
-            POUND@[23; 24) "#"
-            L_BRACK@[24; 25) "["
-            PATH@[25; 28)
-              PATH_SEGMENT@[25; 28)
-                NAME_REF@[25; 28)
-                  IDENT@[25; 28) "cfg"
-            TOKEN_TREE@[28; 34)
-              L_PAREN@[28; 29) "("
-              IDENT@[29; 33) "test"
-              R_PAREN@[33; 34) ")"
-            R_BRACK@[34; 35) "]"
-          WHITESPACE@[35; 36) " "
-          INT_NUMBER@[36; 37) "2"
-        R_BRACK@[37; 38) "]"
-    SEMICOLON@[38; 39) ";"
-  WHITESPACE@[39; 40) "\n"
+SOURCE_FILE@0..40
+  CONST_DEF@0..39
+    CONST_KW@0..5 "const"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "A"
+    COLON@7..8 ":"
+    WHITESPACE@8..9 " "
+    REFERENCE_TYPE@9..15
+      AMP@9..10 "&"
+      SLICE_TYPE@10..15
+        L_BRACK@10..11 "["
+        PATH_TYPE@11..14
+          PATH@11..14
+            PATH_SEGMENT@11..14
+              NAME_REF@11..14
+                IDENT@11..14 "i64"
+        R_BRACK@14..15 "]"
+    WHITESPACE@15..16 " "
+    EQ@16..17 "="
+    WHITESPACE@17..18 " "
+    REF_EXPR@18..38
+      AMP@18..19 "&"
+      ARRAY_EXPR@19..38
+        L_BRACK@19..20 "["
+        LITERAL@20..21
+          INT_NUMBER@20..21 "1"
+        COMMA@21..22 ","
+        WHITESPACE@22..23 " "
+        LITERAL@23..37
+          ATTR@23..35
+            POUND@23..24 "#"
+            L_BRACK@24..25 "["
+            PATH@25..28
+              PATH_SEGMENT@25..28
+                NAME_REF@25..28
+                  IDENT@25..28 "cfg"
+            TOKEN_TREE@28..34
+              L_PAREN@28..29 "("
+              IDENT@29..33 "test"
+              R_PAREN@33..34 ")"
+            R_BRACK@34..35 "]"
+          WHITESPACE@35..36 " "
+          INT_NUMBER@36..37 "2"
+        R_BRACK@37..38 "]"
+    SEMICOLON@38..39 ";"
+  WHITESPACE@39..40 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index 2d46eebb3..e70c3b710 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
@@ -1,38 +1,38 @@
-SOURCE_FILE@[0; 29)
-  IMPL_DEF@[0; 28)
-    IMPL_KW@[0; 4) "impl"
-    TYPE_PARAM_LIST@[4; 18)
-      L_ANGLE@[4; 5) "<"
-      CONST_PARAM@[5; 17)
-        CONST_KW@[5; 10) "const"
-        WHITESPACE@[10; 11) " "
-        NAME@[11; 12)
-          IDENT@[11; 12) "N"
-        COLON@[12; 13) ":"
-        WHITESPACE@[13; 14) " "
-        PATH_TYPE@[14; 17)
-          PATH@[14; 17)
-            PATH_SEGMENT@[14; 17)
-              NAME_REF@[14; 17)
-                IDENT@[14; 17) "u32"
-      R_ANGLE@[17; 18) ">"
-    WHITESPACE@[18; 19) " "
-    PATH_TYPE@[19; 25)
-      PATH@[19; 25)
-        PATH_SEGMENT@[19; 25)
-          NAME_REF@[19; 22)
-            IDENT@[19; 22) "Bar"
-          TYPE_ARG_LIST@[22; 25)
-            L_ANGLE@[22; 23) "<"
-            TYPE_ARG@[23; 24)
-              PATH_TYPE@[23; 24)
-                PATH@[23; 24)
-                  PATH_SEGMENT@[23; 24)
-                    NAME_REF@[23; 24)
-                      IDENT@[23; 24) "N"
-            R_ANGLE@[24; 25) ">"
-    WHITESPACE@[25; 26) " "
-    ITEM_LIST@[26; 28)
-      L_CURLY@[26; 27) "{"
-      R_CURLY@[27; 28) "}"
-  WHITESPACE@[28; 29) "\n"
+SOURCE_FILE@0..29
+  IMPL_DEF@0..28
+    IMPL_KW@0..4 "impl"
+    TYPE_PARAM_LIST@4..18
+      L_ANGLE@4..5 "<"
+      CONST_PARAM@5..17
+        CONST_KW@5..10 "const"
+        WHITESPACE@10..11 " "
+        NAME@11..12
+          IDENT@11..12 "N"
+        COLON@12..13 ":"
+        WHITESPACE@13..14 " "
+        PATH_TYPE@14..17
+          PATH@14..17
+            PATH_SEGMENT@14..17
+              NAME_REF@14..17
+                IDENT@14..17 "u32"
+      R_ANGLE@17..18 ">"
+    WHITESPACE@18..19 " "
+    PATH_TYPE@19..25
+      PATH@19..25
+        PATH_SEGMENT@19..25
+          NAME_REF@19..22
+            IDENT@19..22 "Bar"
+          TYPE_ARG_LIST@22..25
+            L_ANGLE@22..23 "<"
+            TYPE_ARG@23..24
+              PATH_TYPE@23..24
+                PATH@23..24
+                  PATH_SEGMENT@23..24
+                    NAME_REF@23..24
+                      IDENT@23..24 "N"
+            R_ANGLE@24..25 ">"
+    WHITESPACE@25..26 " "
+    ITEM_LIST@26..28
+      L_CURLY@26..27 "{"
+      R_CURLY@27..28 "}"
+  WHITESPACE@28..29 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index 167c0fffa..48d73a4e7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
@@ -1,128 +1,128 @@
-SOURCE_FILE@[0; 83)
-  TRAIT_DEF@[0; 18)
-    TRAIT_KW@[0; 5) "trait"
-    WHITESPACE@[5; 6) " "
-    NAME@[6; 7)
-      IDENT@[6; 7) "Z"
-    TYPE_PARAM_LIST@[7; 10)
-      L_ANGLE@[7; 8) "<"
-      TYPE_PARAM@[8; 9)
-        NAME@[8; 9)
-          IDENT@[8; 9) "U"
-      R_ANGLE@[9; 10) ">"
-    WHITESPACE@[10; 11) " "
-    EQ@[11; 12) "="
-    WHITESPACE@[12; 13) " "
-    TYPE_BOUND_LIST@[13; 17)
-      TYPE_BOUND@[13; 17)
-        PATH_TYPE@[13; 17)
-          PATH@[13; 17)
-            PATH_SEGMENT@[13; 17)
-              NAME_REF@[13; 14)
-                IDENT@[13; 14) "T"
-              TYPE_ARG_LIST@[14; 17)
-                L_ANGLE@[14; 15) "<"
-                TYPE_ARG@[15; 16)
-                  PATH_TYPE@[15; 16)
-                    PATH@[15; 16)
-                      PATH_SEGMENT@[15; 16)
-                        NAME_REF@[15; 16)
-                          IDENT@[15; 16) "U"
-                R_ANGLE@[16; 17) ">"
-    SEMICOLON@[17; 18) ";"
-  WHITESPACE@[18; 19) "\n"
-  TRAIT_DEF@[19; 51)
-    TRAIT_KW@[19; 24) "trait"
-    WHITESPACE@[24; 25) " "
-    NAME@[25; 26)
-      IDENT@[25; 26) "Z"
-    TYPE_PARAM_LIST@[26; 29)
-      L_ANGLE@[26; 27) "<"
-      TYPE_PARAM@[27; 28)
-        NAME@[27; 28)
-          IDENT@[27; 28) "U"
-      R_ANGLE@[28; 29) ">"
-    WHITESPACE@[29; 30) " "
-    EQ@[30; 31) "="
-    WHITESPACE@[31; 32) " "
-    TYPE_BOUND_LIST@[32; 36)
-      TYPE_BOUND@[32; 36)
-        PATH_TYPE@[32; 36)
-          PATH@[32; 36)
-            PATH_SEGMENT@[32; 36)
-              NAME_REF@[32; 33)
-                IDENT@[32; 33) "T"
-              TYPE_ARG_LIST@[33; 36)
-                L_ANGLE@[33; 34) "<"
-                TYPE_ARG@[34; 35)
-                  PATH_TYPE@[34; 35)
-                    PATH@[34; 35)
-                      PATH_SEGMENT@[34; 35)
-                        NAME_REF@[34; 35)
-                          IDENT@[34; 35) "U"
-                R_ANGLE@[35; 36) ">"
-    WHITESPACE@[36; 37) " "
-    WHERE_CLAUSE@[37; 50)
-      WHERE_KW@[37; 42) "where"
-      WHITESPACE@[42; 43) " "
-      WHERE_PRED@[43; 50)
-        PATH_TYPE@[43; 44)
-          PATH@[43; 44)
-            PATH_SEGMENT@[43; 44)
-              NAME_REF@[43; 44)
-                IDENT@[43; 44) "U"
-        COLON@[44; 45) ":"
-        WHITESPACE@[45; 46) " "
-        TYPE_BOUND_LIST@[46; 50)
-          TYPE_BOUND@[46; 50)
-            PATH_TYPE@[46; 50)
-              PATH@[46; 50)
-                PATH_SEGMENT@[46; 50)
-                  NAME_REF@[46; 50)
-                    IDENT@[46; 50) "Copy"
-    SEMICOLON@[50; 51) ";"
-  WHITESPACE@[51; 52) "\n"
-  TRAIT_DEF@[52; 82)
-    TRAIT_KW@[52; 57) "trait"
-    WHITESPACE@[57; 58) " "
-    NAME@[58; 59)
-      IDENT@[58; 59) "Z"
-    TYPE_PARAM_LIST@[59; 62)
-      L_ANGLE@[59; 60) "<"
-      TYPE_PARAM@[60; 61)
-        NAME@[60; 61)
-          IDENT@[60; 61) "U"
-      R_ANGLE@[61; 62) ">"
-    WHITESPACE@[62; 63) " "
-    EQ@[63; 64) "="
-    WHITESPACE@[64; 65) " "
-    TYPE_BOUND_LIST@[65; 65)
-    WHERE_CLAUSE@[65; 81)
-      WHERE_KW@[65; 70) "where"
-      WHITESPACE@[70; 71) " "
-      WHERE_PRED@[71; 81)
-        PATH_TYPE@[71; 75)
-          PATH@[71; 75)
-            PATH_SEGMENT@[71; 75)
-              NAME_REF@[71; 75)
-                IDENT@[71; 75) "Self"
-        COLON@[75; 76) ":"
-        WHITESPACE@[76; 77) " "
-        TYPE_BOUND_LIST@[77; 81)
-          TYPE_BOUND@[77; 81)
-            PATH_TYPE@[77; 81)
-              PATH@[77; 81)
-                PATH_SEGMENT@[77; 81)
-                  NAME_REF@[77; 78)
-                    IDENT@[77; 78) "T"
-                  TYPE_ARG_LIST@[78; 81)
-                    L_ANGLE@[78; 79) "<"
-                    TYPE_ARG@[79; 80)
-                      PATH_TYPE@[79; 80)
-                        PATH@[79; 80)
-                          PATH_SEGMENT@[79; 80)
-                            NAME_REF@[79; 80)
-                              IDENT@[79; 80) "U"
-                    R_ANGLE@[80; 81) ">"
-    SEMICOLON@[81; 82) ";"
-  WHITESPACE@[82; 83) "\n"
+SOURCE_FILE@0..83
+  TRAIT_DEF@0..18
+    TRAIT_KW@0..5 "trait"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "Z"
+    TYPE_PARAM_LIST@7..10
+      L_ANGLE@7..8 "<"
+      TYPE_PARAM@8..9
+        NAME@8..9
+          IDENT@8..9 "U"
+      R_ANGLE@9..10 ">"
+    WHITESPACE@10..11 " "
+    EQ@11..12 "="
+    WHITESPACE@12..13 " "
+    TYPE_BOUND_LIST@13..17
+      TYPE_BOUND@13..17
+        PATH_TYPE@13..17
+          PATH@13..17
+            PATH_SEGMENT@13..17
+              NAME_REF@13..14
+                IDENT@13..14 "T"
+              TYPE_ARG_LIST@14..17
+                L_ANGLE@14..15 "<"
+                TYPE_ARG@15..16
+                  PATH_TYPE@15..16
+                    PATH@15..16
+                      PATH_SEGMENT@15..16
+                        NAME_REF@15..16
+                          IDENT@15..16 "U"
+                R_ANGLE@16..17 ">"
+    SEMICOLON@17..18 ";"
+  WHITESPACE@18..19 "\n"
+  TRAIT_DEF@19..51
+    TRAIT_KW@19..24 "trait"
+    WHITESPACE@24..25 " "
+    NAME@25..26
+      IDENT@25..26 "Z"
+    TYPE_PARAM_LIST@26..29
+      L_ANGLE@26..27 "<"
+      TYPE_PARAM@27..28
+        NAME@27..28
+          IDENT@27..28 "U"
+      R_ANGLE@28..29 ">"
+    WHITESPACE@29..30 " "
+    EQ@30..31 "="
+    WHITESPACE@31..32 " "
+    TYPE_BOUND_LIST@32..36
+      TYPE_BOUND@32..36
+        PATH_TYPE@32..36
+          PATH@32..36
+            PATH_SEGMENT@32..36
+              NAME_REF@32..33
+                IDENT@32..33 "T"
+              TYPE_ARG_LIST@33..36
+                L_ANGLE@33..34 "<"
+                TYPE_ARG@34..35
+                  PATH_TYPE@34..35
+                    PATH@34..35
+                      PATH_SEGMENT@34..35
+                        NAME_REF@34..35
+                          IDENT@34..35 "U"
+                R_ANGLE@35..36 ">"
+    WHITESPACE@36..37 " "
+    WHERE_CLAUSE@37..50
+      WHERE_KW@37..42 "where"
+      WHITESPACE@42..43 " "
+      WHERE_PRED@43..50
+        PATH_TYPE@43..44
+          PATH@43..44
+            PATH_SEGMENT@43..44
+              NAME_REF@43..44
+                IDENT@43..44 "U"
+        COLON@44..45 ":"
+        WHITESPACE@45..46 " "
+        TYPE_BOUND_LIST@46..50
+          TYPE_BOUND@46..50
+            PATH_TYPE@46..50
+              PATH@46..50
+                PATH_SEGMENT@46..50
+                  NAME_REF@46..50
+                    IDENT@46..50 "Copy"
+    SEMICOLON@50..51 ";"
+  WHITESPACE@51..52 "\n"
+  TRAIT_DEF@52..82
+    TRAIT_KW@52..57 "trait"
+    WHITESPACE@57..58 " "
+    NAME@58..59
+      IDENT@58..59 "Z"
+    TYPE_PARAM_LIST@59..62
+      L_ANGLE@59..60 "<"
+      TYPE_PARAM@60..61
+        NAME@60..61
+          IDENT@60..61 "U"
+      R_ANGLE@61..62 ">"
+    WHITESPACE@62..63 " "
+    EQ@63..64 "="
+    WHITESPACE@64..65 " "
+    TYPE_BOUND_LIST@65..65
+    WHERE_CLAUSE@65..81
+      WHERE_KW@65..70 "where"
+      WHITESPACE@70..71 " "
+      WHERE_PRED@71..81
+        PATH_TYPE@71..75
+          PATH@71..75
+            PATH_SEGMENT@71..75
+              NAME_REF@71..75
+                IDENT@71..75 "Self"
+        COLON@75..76 ":"
+        WHITESPACE@76..77 " "
+        TYPE_BOUND_LIST@77..81
+          TYPE_BOUND@77..81
+            PATH_TYPE@77..81
+              PATH@77..81
+                PATH_SEGMENT@77..81
+                  NAME_REF@77..78
+                    IDENT@77..78 "T"
+                  TYPE_ARG_LIST@78..81
+                    L_ANGLE@78..79 "<"
+                    TYPE_ARG@79..80
+                      PATH_TYPE@79..80
+                        PATH@79..80
+                          PATH_SEGMENT@79..80
+                            NAME_REF@79..80
+                              IDENT@79..80 "U"
+                    R_ANGLE@80..81 ">"
+    SEMICOLON@81..82 ";"
+  WHITESPACE@82..83 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
index 8092d7009..c2e290a62 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
@@ -1,37 +1,37 @@
-SOURCE_FILE@[0; 34)
-  FN_DEF@[0; 33)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 33)
-      BLOCK@[10; 33)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        CALL_EXPR@[16; 31)
-          PATH_EXPR@[16; 19)
-            PATH@[16; 19)
-              PATH_SEGMENT@[16; 19)
-                NAME_REF@[16; 19)
-                  IDENT@[16; 19) "foo"
-          ARG_LIST@[19; 31)
-            L_PAREN@[19; 20) "("
-            LITERAL@[20; 30)
-              ATTR@[20; 27)
-                POUND@[20; 21) "#"
-                L_BRACK@[21; 22) "["
-                PATH@[22; 26)
-                  PATH_SEGMENT@[22; 26)
-                    NAME_REF@[22; 26)
-                      IDENT@[22; 26) "attr"
-                R_BRACK@[26; 27) "]"
-              WHITESPACE@[27; 28) " "
-              INT_NUMBER@[28; 30) "92"
-            R_PAREN@[30; 31) ")"
-        WHITESPACE@[31; 32) "\n"
-        R_CURLY@[32; 33) "}"
-  WHITESPACE@[33; 34) "\n"
+SOURCE_FILE@0..34
+  FN_DEF@0..33
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..33
+      BLOCK@10..33
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        CALL_EXPR@16..31
+          PATH_EXPR@16..19
+            PATH@16..19
+              PATH_SEGMENT@16..19
+                NAME_REF@16..19
+                  IDENT@16..19 "foo"
+          ARG_LIST@19..31
+            L_PAREN@19..20 "("
+            LITERAL@20..30
+              ATTR@20..27
+                POUND@20..21 "#"
+                L_BRACK@21..22 "["
+                PATH@22..26
+                  PATH_SEGMENT@22..26
+                    NAME_REF@22..26
+                      IDENT@22..26 "attr"
+                R_BRACK@26..27 "]"
+              WHITESPACE@27..28 " "
+              INT_NUMBER@28..30 "92"
+            R_PAREN@30..31 ")"
+        WHITESPACE@31..32 "\n"
+        R_CURLY@32..33 "}"
+  WHITESPACE@33..34 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
index ee1bd361d..861065362 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
@@ -1,58 +1,58 @@
-SOURCE_FILE@[0; 55)
-  TYPE_ALIAS_DEF@[0; 24)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 8)
-      IDENT@[5; 8) "Foo"
-    WHITESPACE@[8; 9) " "
-    EQ@[9; 10) "="
-    WHITESPACE@[10; 11) " "
-    FN_POINTER_TYPE@[11; 23)
-      FN_KW@[11; 13) "fn"
-      PARAM_LIST@[13; 23)
-        L_PAREN@[13; 14) "("
-        PARAM@[14; 22)
-          PATH_TYPE@[14; 22)
-            PATH@[14; 22)
-              PATH@[14; 17)
-                PATH_SEGMENT@[14; 17)
-                  NAME_REF@[14; 17)
-                    IDENT@[14; 17) "Bar"
-              COLON2@[17; 19) "::"
-              PATH_SEGMENT@[19; 22)
-                NAME_REF@[19; 22)
-                  IDENT@[19; 22) "Baz"
-        R_PAREN@[22; 23) ")"
-    SEMICOLON@[23; 24) ";"
-  WHITESPACE@[24; 25) "\n"
-  TYPE_ALIAS_DEF@[25; 54)
-    TYPE_KW@[25; 29) "type"
-    WHITESPACE@[29; 30) " "
-    NAME@[30; 33)
-      IDENT@[30; 33) "Qux"
-    WHITESPACE@[33; 34) " "
-    EQ@[34; 35) "="
-    WHITESPACE@[35; 36) " "
-    FN_POINTER_TYPE@[36; 53)
-      FN_KW@[36; 38) "fn"
-      PARAM_LIST@[38; 53)
-        L_PAREN@[38; 39) "("
-        PARAM@[39; 52)
-          BIND_PAT@[39; 42)
-            NAME@[39; 42)
-              IDENT@[39; 42) "baz"
-          COLON@[42; 43) ":"
-          WHITESPACE@[43; 44) " "
-          PATH_TYPE@[44; 52)
-            PATH@[44; 52)
-              PATH@[44; 47)
-                PATH_SEGMENT@[44; 47)
-                  NAME_REF@[44; 47)
-                    IDENT@[44; 47) "Bar"
-              COLON2@[47; 49) "::"
-              PATH_SEGMENT@[49; 52)
-                NAME_REF@[49; 52)
-                  IDENT@[49; 52) "Baz"
-        R_PAREN@[52; 53) ")"
-    SEMICOLON@[53; 54) ";"
-  WHITESPACE@[54; 55) "\n"
+SOURCE_FILE@0..55
+  TYPE_ALIAS_DEF@0..24
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..8
+      IDENT@5..8 "Foo"
+    WHITESPACE@8..9 " "
+    EQ@9..10 "="
+    WHITESPACE@10..11 " "
+    FN_POINTER_TYPE@11..23
+      FN_KW@11..13 "fn"
+      PARAM_LIST@13..23
+        L_PAREN@13..14 "("
+        PARAM@14..22
+          PATH_TYPE@14..22
+            PATH@14..22
+              PATH@14..17
+                PATH_SEGMENT@14..17
+                  NAME_REF@14..17
+                    IDENT@14..17 "Bar"
+              COLON2@17..19 "::"
+              PATH_SEGMENT@19..22
+                NAME_REF@19..22
+                  IDENT@19..22 "Baz"
+        R_PAREN@22..23 ")"
+    SEMICOLON@23..24 ";"
+  WHITESPACE@24..25 "\n"
+  TYPE_ALIAS_DEF@25..54
+    TYPE_KW@25..29 "type"
+    WHITESPACE@29..30 " "
+    NAME@30..33
+      IDENT@30..33 "Qux"
+    WHITESPACE@33..34 " "
+    EQ@34..35 "="
+    WHITESPACE@35..36 " "
+    FN_POINTER_TYPE@36..53
+      FN_KW@36..38 "fn"
+      PARAM_LIST@38..53
+        L_PAREN@38..39 "("
+        PARAM@39..52
+          BIND_PAT@39..42
+            NAME@39..42
+              IDENT@39..42 "baz"
+          COLON@42..43 ":"
+          WHITESPACE@43..44 " "
+          PATH_TYPE@44..52
+            PATH@44..52
+              PATH@44..47
+                PATH_SEGMENT@44..47
+                  NAME_REF@44..47
+                    IDENT@44..47 "Bar"
+              COLON2@47..49 "::"
+              PATH_SEGMENT@49..52
+                NAME_REF@49..52
+                  IDENT@49..52 "Baz"
+        R_PAREN@52..53 ")"
+    SEMICOLON@53..54 ";"
+  WHITESPACE@54..55 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
index a5f8b6480..dad3dfe4d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
@@ -1,70 +1,70 @@
-SOURCE_FILE@[0; 63)
-  FN_DEF@[0; 62)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 62)
-      BLOCK@[10; 62)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 15) "\n   "
-        LET_STMT@[15; 60)
-          LET_KW@[15; 18) "let"
-          WHITESPACE@[18; 19) " "
-          BIND_PAT@[19; 22)
-            NAME@[19; 22)
-              IDENT@[19; 22) "foo"
-          WHITESPACE@[22; 23) " "
-          EQ@[23; 24) "="
-          WHITESPACE@[24; 25) " "
-          LAMBDA_EXPR@[25; 59)
-            PARAM_LIST@[25; 56)
-              PIPE@[25; 26) "|"
-              PARAM@[26; 29)
-                BIND_PAT@[26; 29)
-                  NAME@[26; 29)
-                    IDENT@[26; 29) "bar"
-              COMMA@[29; 30) ","
-              WHITESPACE@[30; 31) " "
-              PARAM@[31; 39)
-                BIND_PAT@[31; 34)
-                  NAME@[31; 34)
-                    IDENT@[31; 34) "baz"
-                COLON@[34; 35) ":"
-                WHITESPACE@[35; 36) " "
-                PATH_TYPE@[36; 39)
-                  PATH@[36; 39)
-                    PATH_SEGMENT@[36; 39)
-                      NAME_REF@[36; 39)
-                        IDENT@[36; 39) "Baz"
-              COMMA@[39; 40) ","
-              WHITESPACE@[40; 41) " "
-              PARAM@[41; 55)
-                BIND_PAT@[41; 44)
-                  NAME@[41; 44)
-                    IDENT@[41; 44) "qux"
-                COLON@[44; 45) ":"
-                WHITESPACE@[45; 46) " "
-                PATH_TYPE@[46; 55)
-                  PATH@[46; 55)
-                    PATH@[46; 49)
-                      PATH_SEGMENT@[46; 49)
-                        NAME_REF@[46; 49)
-                          IDENT@[46; 49) "Qux"
-                    COLON2@[49; 51) "::"
-                    PATH_SEGMENT@[51; 55)
-                      NAME_REF@[51; 55)
-                        IDENT@[51; 55) "Quux"
-              PIPE@[55; 56) "|"
-            WHITESPACE@[56; 57) " "
-            TUPLE_EXPR@[57; 59)
-              L_PAREN@[57; 58) "("
-              R_PAREN@[58; 59) ")"
-          SEMICOLON@[59; 60) ";"
-        WHITESPACE@[60; 61) "\n"
-        R_CURLY@[61; 62) "}"
-  WHITESPACE@[62; 63) "\n"
+SOURCE_FILE@0..63
+  FN_DEF@0..62
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..62
+      BLOCK@10..62
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..15 "\n   "
+        LET_STMT@15..60
+          LET_KW@15..18 "let"
+          WHITESPACE@18..19 " "
+          BIND_PAT@19..22
+            NAME@19..22
+              IDENT@19..22 "foo"
+          WHITESPACE@22..23 " "
+          EQ@23..24 "="
+          WHITESPACE@24..25 " "
+          LAMBDA_EXPR@25..59
+            PARAM_LIST@25..56
+              PIPE@25..26 "|"
+              PARAM@26..29
+                BIND_PAT@26..29
+                  NAME@26..29
+                    IDENT@26..29 "bar"
+              COMMA@29..30 ","
+              WHITESPACE@30..31 " "
+              PARAM@31..39
+                BIND_PAT@31..34
+                  NAME@31..34
+                    IDENT@31..34 "baz"
+                COLON@34..35 ":"
+                WHITESPACE@35..36 " "
+                PATH_TYPE@36..39
+                  PATH@36..39
+                    PATH_SEGMENT@36..39
+                      NAME_REF@36..39
+                        IDENT@36..39 "Baz"
+              COMMA@39..40 ","
+              WHITESPACE@40..41 " "
+              PARAM@41..55
+                BIND_PAT@41..44
+                  NAME@41..44
+                    IDENT@41..44 "qux"
+                COLON@44..45 ":"
+                WHITESPACE@45..46 " "
+                PATH_TYPE@46..55
+                  PATH@46..55
+                    PATH@46..49
+                      PATH_SEGMENT@46..49
+                        NAME_REF@46..49
+                          IDENT@46..49 "Qux"
+                    COLON2@49..51 "::"
+                    PATH_SEGMENT@51..55
+                      NAME_REF@51..55
+                        IDENT@51..55 "Quux"
+              PIPE@55..56 "|"
+            WHITESPACE@56..57 " "
+            TUPLE_EXPR@57..59
+              L_PAREN@57..58 "("
+              R_PAREN@58..59 ")"
+          SEMICOLON@59..60 ";"
+        WHITESPACE@60..61 "\n"
+        R_CURLY@61..62 "}"
+  WHITESPACE@62..63 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
index 103e254a6..3110bf5c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
@@ -1,44 +1,44 @@
-SOURCE_FILE@[0; 30)
-  FN_DEF@[0; 29)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 26)
-      L_PAREN@[6; 7) "("
-      PARAM@[7; 25)
-        TUPLE_PAT@[7; 13)
-          L_PAREN@[7; 8) "("
-          BIND_PAT@[8; 9)
-            NAME@[8; 9)
-              IDENT@[8; 9) "x"
-          COMMA@[9; 10) ","
-          WHITESPACE@[10; 11) " "
-          BIND_PAT@[11; 12)
-            NAME@[11; 12)
-              IDENT@[11; 12) "y"
-          R_PAREN@[12; 13) ")"
-        COLON@[13; 14) ":"
-        WHITESPACE@[14; 15) " "
-        TUPLE_TYPE@[15; 25)
-          L_PAREN@[15; 16) "("
-          PATH_TYPE@[16; 19)
-            PATH@[16; 19)
-              PATH_SEGMENT@[16; 19)
-                NAME_REF@[16; 19)
-                  IDENT@[16; 19) "i32"
-          COMMA@[19; 20) ","
-          WHITESPACE@[20; 21) " "
-          PATH_TYPE@[21; 24)
-            PATH@[21; 24)
-              PATH_SEGMENT@[21; 24)
-                NAME_REF@[21; 24)
-                  IDENT@[21; 24) "i32"
-          R_PAREN@[24; 25) ")"
-      R_PAREN@[25; 26) ")"
-    WHITESPACE@[26; 27) " "
-    BLOCK_EXPR@[27; 29)
-      BLOCK@[27; 29)
-        L_CURLY@[27; 28) "{"
-        R_CURLY@[28; 29) "}"
-  WHITESPACE@[29; 30) "\n"
+SOURCE_FILE@0..30
+  FN_DEF@0..29
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..26
+      L_PAREN@6..7 "("
+      PARAM@7..25
+        TUPLE_PAT@7..13
+          L_PAREN@7..8 "("
+          BIND_PAT@8..9
+            NAME@8..9
+              IDENT@8..9 "x"
+          COMMA@9..10 ","
+          WHITESPACE@10..11 " "
+          BIND_PAT@11..12
+            NAME@11..12
+              IDENT@11..12 "y"
+          R_PAREN@12..13 ")"
+        COLON@13..14 ":"
+        WHITESPACE@14..15 " "
+        TUPLE_TYPE@15..25
+          L_PAREN@15..16 "("
+          PATH_TYPE@16..19
+            PATH@16..19
+              PATH_SEGMENT@16..19
+                NAME_REF@16..19
+                  IDENT@16..19 "i32"
+          COMMA@19..20 ","
+          WHITESPACE@20..21 " "
+          PATH_TYPE@21..24
+            PATH@21..24
+              PATH_SEGMENT@21..24
+                NAME_REF@21..24
+                  IDENT@21..24 "i32"
+          R_PAREN@24..25 ")"
+      R_PAREN@25..26 ")"
+    WHITESPACE@26..27 " "
+    BLOCK_EXPR@27..29
+      BLOCK@27..29
+        L_CURLY@27..28 "{"
+        R_CURLY@28..29 "}"
+  WHITESPACE@29..30 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
index 3a196d3c0..3f3e6a9a2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
@@ -1,112 +1,112 @@
-SOURCE_FILE@[0; 130)
-  FN_DEF@[0; 129)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 129)
-      BLOCK@[10; 129)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        MATCH_EXPR@[16; 127)
-          MATCH_KW@[16; 21) "match"
-          WHITESPACE@[21; 22) " "
-          TUPLE_EXPR@[22; 24)
-            L_PAREN@[22; 23) "("
-            R_PAREN@[23; 24) ")"
-          WHITESPACE@[24; 25) " "
-          MATCH_ARM_LIST@[25; 127)
-            L_CURLY@[25; 26) "{"
-            WHITESPACE@[26; 35) "\n        "
-            MATCH_ARM@[35; 48)
-              PAREN_PAT@[35; 42)
-                L_PAREN@[35; 36) "("
-                OR_PAT@[36; 41)
-                  PLACEHOLDER_PAT@[36; 37)
-                    UNDERSCORE@[36; 37) "_"
-                  WHITESPACE@[37; 38) " "
-                  PIPE@[38; 39) "|"
-                  WHITESPACE@[39; 40) " "
-                  PLACEHOLDER_PAT@[40; 41)
-                    UNDERSCORE@[40; 41) "_"
-                R_PAREN@[41; 42) ")"
-              WHITESPACE@[42; 43) " "
-              FAT_ARROW@[43; 45) "=>"
-              WHITESPACE@[45; 46) " "
-              TUPLE_EXPR@[46; 48)
-                L_PAREN@[46; 47) "("
-                R_PAREN@[47; 48) ")"
-            COMMA@[48; 49) ","
-            WHITESPACE@[49; 58) "\n        "
-            MATCH_ARM@[58; 72)
-              REF_PAT@[58; 66)
-                AMP@[58; 59) "&"
-                PAREN_PAT@[59; 66)
-                  L_PAREN@[59; 60) "("
-                  OR_PAT@[60; 65)
-                    PLACEHOLDER_PAT@[60; 61)
-                      UNDERSCORE@[60; 61) "_"
-                    WHITESPACE@[61; 62) " "
-                    PIPE@[62; 63) "|"
-                    WHITESPACE@[63; 64) " "
-                    PLACEHOLDER_PAT@[64; 65)
-                      UNDERSCORE@[64; 65) "_"
-                  R_PAREN@[65; 66) ")"
-              WHITESPACE@[66; 67) " "
-              FAT_ARROW@[67; 69) "=>"
-              WHITESPACE@[69; 70) " "
-              TUPLE_EXPR@[70; 72)
-                L_PAREN@[70; 71) "("
-                R_PAREN@[71; 72) ")"
-            COMMA@[72; 73) ","
-            WHITESPACE@[73; 82) "\n        "
-            MATCH_ARM@[82; 96)
-              TUPLE_PAT@[82; 90)
-                L_PAREN@[82; 83) "("
-                OR_PAT@[83; 88)
-                  PLACEHOLDER_PAT@[83; 84)
-                    UNDERSCORE@[83; 84) "_"
-                  WHITESPACE@[84; 85) " "
-                  PIPE@[85; 86) "|"
-                  WHITESPACE@[86; 87) " "
-                  PLACEHOLDER_PAT@[87; 88)
-                    UNDERSCORE@[87; 88) "_"
-                COMMA@[88; 89) ","
-                R_PAREN@[89; 90) ")"
-              WHITESPACE@[90; 91) " "
-              FAT_ARROW@[91; 93) "=>"
-              WHITESPACE@[93; 94) " "
-              TUPLE_EXPR@[94; 96)
-                L_PAREN@[94; 95) "("
-                R_PAREN@[95; 96) ")"
-            COMMA@[96; 97) ","
-            WHITESPACE@[97; 106) "\n        "
-            MATCH_ARM@[106; 120)
-              SLICE_PAT@[106; 114)
-                L_BRACK@[106; 107) "["
-                OR_PAT@[107; 112)
-                  PLACEHOLDER_PAT@[107; 108)
-                    UNDERSCORE@[107; 108) "_"
-                  WHITESPACE@[108; 109) " "
-                  PIPE@[109; 110) "|"
-                  WHITESPACE@[110; 111) " "
-                  PLACEHOLDER_PAT@[111; 112)
-                    UNDERSCORE@[111; 112) "_"
-                COMMA@[112; 113) ","
-                R_BRACK@[113; 114) "]"
-              WHITESPACE@[114; 115) " "
-              FAT_ARROW@[115; 117) "=>"
-              WHITESPACE@[117; 118) " "
-              TUPLE_EXPR@[118; 120)
-                L_PAREN@[118; 119) "("
-                R_PAREN@[119; 120) ")"
-            COMMA@[120; 121) ","
-            WHITESPACE@[121; 126) "\n    "
-            R_CURLY@[126; 127) "}"
-        WHITESPACE@[127; 128) "\n"
-        R_CURLY@[128; 129) "}"
-  WHITESPACE@[129; 130) "\n"
+SOURCE_FILE@0..130
+  FN_DEF@0..129
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..129
+      BLOCK@10..129
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        MATCH_EXPR@16..127
+          MATCH_KW@16..21 "match"
+          WHITESPACE@21..22 " "
+          TUPLE_EXPR@22..24
+            L_PAREN@22..23 "("
+            R_PAREN@23..24 ")"
+          WHITESPACE@24..25 " "
+          MATCH_ARM_LIST@25..127
+            L_CURLY@25..26 "{"
+            WHITESPACE@26..35 "\n        "
+            MATCH_ARM@35..48
+              PAREN_PAT@35..42
+                L_PAREN@35..36 "("
+                OR_PAT@36..41
+                  PLACEHOLDER_PAT@36..37
+                    UNDERSCORE@36..37 "_"
+                  WHITESPACE@37..38 " "
+                  PIPE@38..39 "|"
+                  WHITESPACE@39..40 " "
+                  PLACEHOLDER_PAT@40..41
+                    UNDERSCORE@40..41 "_"
+                R_PAREN@41..42 ")"
+              WHITESPACE@42..43 " "
+              FAT_ARROW@43..45 "=>"
+              WHITESPACE@45..46 " "
+              TUPLE_EXPR@46..48
+                L_PAREN@46..47 "("
+                R_PAREN@47..48 ")"
+            COMMA@48..49 ","
+            WHITESPACE@49..58 "\n        "
+            MATCH_ARM@58..72
+              REF_PAT@58..66
+                AMP@58..59 "&"
+                PAREN_PAT@59..66
+                  L_PAREN@59..60 "("
+                  OR_PAT@60..65
+                    PLACEHOLDER_PAT@60..61
+                      UNDERSCORE@60..61 "_"
+                    WHITESPACE@61..62 " "
+                    PIPE@62..63 "|"
+                    WHITESPACE@63..64 " "
+                    PLACEHOLDER_PAT@64..65
+                      UNDERSCORE@64..65 "_"
+                  R_PAREN@65..66 ")"
+              WHITESPACE@66..67 " "
+              FAT_ARROW@67..69 "=>"
+              WHITESPACE@69..70 " "
+              TUPLE_EXPR@70..72
+                L_PAREN@70..71 "("
+                R_PAREN@71..72 ")"
+            COMMA@72..73 ","
+            WHITESPACE@73..82 "\n        "
+            MATCH_ARM@82..96
+              TUPLE_PAT@82..90
+                L_PAREN@82..83 "("
+                OR_PAT@83..88
+                  PLACEHOLDER_PAT@83..84
+                    UNDERSCORE@83..84 "_"
+                  WHITESPACE@84..85 " "
+                  PIPE@85..86 "|"
+                  WHITESPACE@86..87 " "
+                  PLACEHOLDER_PAT@87..88
+                    UNDERSCORE@87..88 "_"
+                COMMA@88..89 ","
+                R_PAREN@89..90 ")"
+              WHITESPACE@90..91 " "
+              FAT_ARROW@91..93 "=>"
+              WHITESPACE@93..94 " "
+              TUPLE_EXPR@94..96
+                L_PAREN@94..95 "("
+                R_PAREN@95..96 ")"
+            COMMA@96..97 ","
+            WHITESPACE@97..106 "\n        "
+            MATCH_ARM@106..120
+              SLICE_PAT@106..114
+                L_BRACK@106..107 "["
+                OR_PAT@107..112
+                  PLACEHOLDER_PAT@107..108
+                    UNDERSCORE@107..108 "_"
+                  WHITESPACE@108..109 " "
+                  PIPE@109..110 "|"
+                  WHITESPACE@110..111 " "
+                  PLACEHOLDER_PAT@111..112
+                    UNDERSCORE@111..112 "_"
+                COMMA@112..113 ","
+                R_BRACK@113..114 "]"
+              WHITESPACE@114..115 " "
+              FAT_ARROW@115..117 "=>"
+              WHITESPACE@117..118 " "
+              TUPLE_EXPR@118..120
+                L_PAREN@118..119 "("
+                R_PAREN@119..120 ")"
+            COMMA@120..121 ","
+            WHITESPACE@121..126 "\n    "
+            R_CURLY@126..127 "}"
+        WHITESPACE@127..128 "\n"
+        R_CURLY@128..129 "}"
+  WHITESPACE@129..130 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
index e0081a9f2..fad9df007 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
@@ -1,26 +1,26 @@
-SOURCE_FILE@[0; 23)
-  TYPE_ALIAS_DEF@[0; 22)
-    TYPE_KW@[0; 4) "type"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 8)
-      IDENT@[5; 8) "Foo"
-    WHITESPACE@[8; 9) " "
-    EQ@[9; 10) "="
-    WHITESPACE@[10; 11) " "
-    FN_POINTER_TYPE@[11; 21)
-      FN_KW@[11; 13) "fn"
-      PARAM_LIST@[13; 21)
-        L_PAREN@[13; 14) "("
-        PARAM@[14; 20)
-          PLACEHOLDER_PAT@[14; 15)
-            UNDERSCORE@[14; 15) "_"
-          COLON@[15; 16) ":"
-          WHITESPACE@[16; 17) " "
-          PATH_TYPE@[17; 20)
-            PATH@[17; 20)
-              PATH_SEGMENT@[17; 20)
-                NAME_REF@[17; 20)
-                  IDENT@[17; 20) "bar"
-        R_PAREN@[20; 21) ")"
-    SEMICOLON@[21; 22) ";"
-  WHITESPACE@[22; 23) "\n"
+SOURCE_FILE@0..23
+  TYPE_ALIAS_DEF@0..22
+    TYPE_KW@0..4 "type"
+    WHITESPACE@4..5 " "
+    NAME@5..8
+      IDENT@5..8 "Foo"
+    WHITESPACE@8..9 " "
+    EQ@9..10 "="
+    WHITESPACE@10..11 " "
+    FN_POINTER_TYPE@11..21
+      FN_KW@11..13 "fn"
+      PARAM_LIST@13..21
+        L_PAREN@13..14 "("
+        PARAM@14..20
+          PLACEHOLDER_PAT@14..15
+            UNDERSCORE@14..15 "_"
+          COLON@15..16 ":"
+          WHITESPACE@16..17 " "
+          PATH_TYPE@17..20
+            PATH@17..20
+              PATH_SEGMENT@17..20
+                NAME_REF@17..20
+                  IDENT@17..20 "bar"
+        R_PAREN@20..21 ")"
+    SEMICOLON@21..22 ";"
+  WHITESPACE@22..23 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
index a378dd80b..e8a0e9ddd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
@@ -1,30 +1,30 @@
-SOURCE_FILE@[0; 23)
-  ENUM_DEF@[0; 22)
-    ENUM_KW@[0; 4) "enum"
-    WHITESPACE@[4; 5) " "
-    NAME@[5; 6)
-      IDENT@[5; 6) "E"
-    WHITESPACE@[6; 7) " "
-    ENUM_VARIANT_LIST@[7; 22)
-      L_CURLY@[7; 8) "{"
-      WHITESPACE@[8; 9) " "
-      ENUM_VARIANT@[9; 20)
-        NAME@[9; 10)
-          IDENT@[9; 10) "X"
-        TUPLE_FIELD_DEF_LIST@[10; 15)
-          L_PAREN@[10; 11) "("
-          TUPLE_FIELD_DEF@[11; 14)
-            PATH_TYPE@[11; 14)
-              PATH@[11; 14)
-                PATH_SEGMENT@[11; 14)
-                  NAME_REF@[11; 14)
-                    IDENT@[11; 14) "i32"
-          R_PAREN@[14; 15) ")"
-        WHITESPACE@[15; 16) " "
-        EQ@[16; 17) "="
-        WHITESPACE@[17; 18) " "
-        LITERAL@[18; 20)
-          INT_NUMBER@[18; 20) "10"
-      WHITESPACE@[20; 21) " "
-      R_CURLY@[21; 22) "}"
-  WHITESPACE@[22; 23) "\n"
+SOURCE_FILE@0..23
+  ENUM_DEF@0..22
+    ENUM_KW@0..4 "enum"
+    WHITESPACE@4..5 " "
+    NAME@5..6
+      IDENT@5..6 "E"
+    WHITESPACE@6..7 " "
+    ENUM_VARIANT_LIST@7..22
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..9 " "
+      ENUM_VARIANT@9..20
+        NAME@9..10
+          IDENT@9..10 "X"
+        TUPLE_FIELD_DEF_LIST@10..15
+          L_PAREN@10..11 "("
+          TUPLE_FIELD_DEF@11..14
+            PATH_TYPE@11..14
+              PATH@11..14
+                PATH_SEGMENT@11..14
+                  NAME_REF@11..14
+                    IDENT@11..14 "i32"
+          R_PAREN@14..15 ")"
+        WHITESPACE@15..16 " "
+        EQ@16..17 "="
+        WHITESPACE@17..18 " "
+        LITERAL@18..20
+          INT_NUMBER@18..20 "10"
+      WHITESPACE@20..21 " "
+      R_CURLY@21..22 "}"
+  WHITESPACE@22..23 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
index 548be2698..50db9e967 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
@@ -1,38 +1,38 @@
-SOURCE_FILE@[0; 28)
-  FN_DEF@[0; 27)
-    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; 27)
-      BLOCK@[9; 27)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 15) "\n    "
-        EXPR_STMT@[15; 25)
-          BIN_EXPR@[15; 24)
-            PATH_EXPR@[15; 16)
-              PATH@[15; 16)
-                PATH_SEGMENT@[15; 16)
-                  NAME_REF@[15; 16)
-                    IDENT@[15; 16) "v"
-            WHITESPACE@[16; 17) " "
-            EQ@[17; 18) "="
-            WHITESPACE@[18; 19) " "
-            BIN_EXPR@[19; 24)
-              BLOCK_EXPR@[19; 22)
-                BLOCK@[19; 22)
-                  L_CURLY@[19; 20) "{"
-                  LITERAL@[20; 21)
-                    INT_NUMBER@[20; 21) "1"
-                  R_CURLY@[21; 22) "}"
-              AMP@[22; 23) "&"
-              LITERAL@[23; 24)
-                INT_NUMBER@[23; 24) "2"
-          SEMICOLON@[24; 25) ";"
-        WHITESPACE@[25; 26) "\n"
-        R_CURLY@[26; 27) "}"
-  WHITESPACE@[27; 28) "\n"
+SOURCE_FILE@0..28
+  FN_DEF@0..27
+    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..27
+      BLOCK@9..27
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        EXPR_STMT@15..25
+          BIN_EXPR@15..24
+            PATH_EXPR@15..16
+              PATH@15..16
+                PATH_SEGMENT@15..16
+                  NAME_REF@15..16
+                    IDENT@15..16 "v"
+            WHITESPACE@16..17 " "
+            EQ@17..18 "="
+            WHITESPACE@18..19 " "
+            BIN_EXPR@19..24
+              BLOCK_EXPR@19..22
+                BLOCK@19..22
+                  L_CURLY@19..20 "{"
+                  LITERAL@20..21
+                    INT_NUMBER@20..21 "1"
+                  R_CURLY@21..22 "}"
+              AMP@22..23 "&"
+              LITERAL@23..24
+                INT_NUMBER@23..24 "2"
+          SEMICOLON@24..25 ";"
+        WHITESPACE@25..26 "\n"
+        R_CURLY@26..27 "}"
+  WHITESPACE@27..28 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
index a7a547fce..c05e05bf3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
@@ -1,45 +1,45 @@
-SOURCE_FILE@[0; 34)
-  FN_DEF@[0; 33)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "main"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 33)
-      BLOCK@[10; 33)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 12) " "
-        EXPR_STMT@[12; 31)
-          CALL_EXPR@[12; 30)
-            LAMBDA_EXPR@[12; 28)
-              PARAM_LIST@[12; 14)
-                PIPE@[12; 13) "|"
-                PIPE@[13; 14) "|"
-              WHITESPACE@[14; 15) " "
-              RET_TYPE@[15; 21)
-                THIN_ARROW@[15; 17) "->"
-                WHITESPACE@[17; 18) " "
-                PATH_TYPE@[18; 21)
-                  PATH@[18; 21)
-                    PATH_SEGMENT@[18; 21)
-                      NAME_REF@[18; 21)
-                        IDENT@[18; 21) "i32"
-              WHITESPACE@[21; 22) " "
-              BLOCK_EXPR@[22; 28)
-                BLOCK@[22; 28)
-                  L_CURLY@[22; 23) "{"
-                  WHITESPACE@[23; 24) " "
-                  LITERAL@[24; 26)
-                    INT_NUMBER@[24; 26) "92"
-                  WHITESPACE@[26; 27) " "
-                  R_CURLY@[27; 28) "}"
-            ARG_LIST@[28; 30)
-              L_PAREN@[28; 29) "("
-              R_PAREN@[29; 30) ")"
-          SEMICOLON@[30; 31) ";"
-        WHITESPACE@[31; 32) " "
-        R_CURLY@[32; 33) "}"
-  WHITESPACE@[33; 34) "\n"
+SOURCE_FILE@0..34
+  FN_DEF@0..33
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..33
+      BLOCK@10..33
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..12 " "
+        EXPR_STMT@12..31
+          CALL_EXPR@12..30
+            LAMBDA_EXPR@12..28
+              PARAM_LIST@12..14
+                PIPE@12..13 "|"
+                PIPE@13..14 "|"
+              WHITESPACE@14..15 " "
+              RET_TYPE@15..21
+                THIN_ARROW@15..17 "->"
+                WHITESPACE@17..18 " "
+                PATH_TYPE@18..21
+                  PATH@18..21
+                    PATH_SEGMENT@18..21
+                      NAME_REF@18..21
+                        IDENT@18..21 "i32"
+              WHITESPACE@21..22 " "
+              BLOCK_EXPR@22..28
+                BLOCK@22..28
+                  L_CURLY@22..23 "{"
+                  WHITESPACE@23..24 " "
+                  LITERAL@24..26
+                    INT_NUMBER@24..26 "92"
+                  WHITESPACE@26..27 " "
+                  R_CURLY@27..28 "}"
+            ARG_LIST@28..30
+              L_PAREN@28..29 "("
+              R_PAREN@29..30 ")"
+          SEMICOLON@30..31 ";"
+        WHITESPACE@31..32 " "
+        R_CURLY@32..33 "}"
+  WHITESPACE@33..34 "\n"