46 files changed, 242 insertions, 242 deletions

diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
index caf794ed2..edcd936b0 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
@@ -31,4 +31,4 @@ SOURCE_FILE@[0; 34)
                 IDENT@[29; 32) "u32"
       WHITESPACE@[32; 33) "\n"
       R_CURLY@[33; 34) "}"
-error [21; 22): expected COMMA
+error [21; 21): expected COMMA
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
index 01d71db8f..2d653715e 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
@@ -14,5 +14,5 @@ SOURCE_FILE@[0; 21)
     RECORD_FIELD_DEF_LIST@[19; 21)
       L_CURLY@[19; 20) "{"
       R_CURLY@[20; 21) "}"
-error [0; 1): expected an item
-error [3; 4): expected an item
+error [0; 0): expected an item
+error [3; 3): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
index d493d60d4..002680583 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
@@ -26,14 +26,14 @@ SOURCE_FILE@[0; 42)
     NAME@[36; 41)
       IDENT@[36; 41) "rusti"
   WHITESPACE@[41; 42) "\n"
-error [23; 24): expected `[`
-error [23; 24): expected an item
-error [27; 28): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [28; 29): expected SEMI
-error [31; 32): expected EXCL
-error [31; 32): expected `{`, `[`, `(`
-error [31; 32): expected SEMI
-error [31; 32): expected an item
-error [35; 36): expected EXCL
-error [41; 42): expected `{`, `[`, `(`
-error [41; 42): expected SEMI
+error [23; 23): expected `[`
+error [23; 23): expected an item
+error [27; 27): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error [28; 28): expected SEMI
+error [31; 31): expected EXCL
+error [31; 31): expected `{`, `[`, `(`
+error [31; 31): expected SEMI
+error [31; 31): expected an item
+error [35; 35): expected EXCL
+error [41; 41): expected `{`, `[`, `(`
+error [41; 41): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
index b25010b50..8039a8913 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
@@ -35,5 +35,5 @@ SOURCE_FILE@[0; 40)
       R_CURLY@[38; 39) "}"
   ERROR@[39; 40)
     SEMI@[39; 40) ";"
-error [39; 40): expected item, found `;`
+error [39; 39): expected item, found `;`
 consider removing this semicolon
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.txt b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.txt
index 16a542b95..5f6e10986 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.txt
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.txt
@@ -13,4 +13,4 @@ SOURCE_FILE@[0; 12)
           ERROR@[9; 11)
             INT_NUMBER@[9; 11) "92"
     SEMI@[11; 12) ";"
-error [9; 10): expected identifier
+error [9; 9): expected identifier
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.txt b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.txt
index f20e6e911..cc11421a9 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.txt
@@ -55,6 +55,6 @@ SOURCE_FILE@[0; 54)
         WHITESPACE@[51; 52) "\n"
         R_CURLY@[52; 53) "}"
   WHITESPACE@[53; 54) "\n"
-error [53; 54): expected R_PAREN
-error [53; 54): expected `]`
-error [53; 54): expected an item
+error [53; 53): expected R_PAREN
+error [53; 53): expected `]`
+error [53; 53): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
index b9d7bbe45..84fd92862 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
@@ -64,11 +64,11 @@ SOURCE_FILE@[0; 74)
       WHITESPACE@[71; 72) "\n"
       R_CURLY@[72; 73) "}"
   WHITESPACE@[73; 74) "\n"
-error [31; 32): expected field declaration
-error [33; 34): expected COMMA
-error [38; 39): expected field declaration
-error [39; 40): expected COMMA
-error [40; 41): expected field declaration
-error [41; 42): expected COMMA
-error [42; 43): expected field declaration
-error [43; 44): expected COMMA
+error [31; 31): expected field declaration
+error [33; 33): expected COMMA
+error [38; 38): expected field declaration
+error [39; 39): expected COMMA
+error [40; 40): expected field declaration
+error [41; 41): expected COMMA
+error [42; 42): expected field declaration
+error [43; 43): expected COMMA
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.txt b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.txt
index 41b8e3890..1978f30fa 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.txt
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.txt
@@ -28,6 +28,6 @@ SOURCE_FILE@[0; 31)
   ERROR@[29; 30)
     R_CURLY@[29; 30) "}"
   WHITESPACE@[30; 31) "\n"
-error [0; 1): unmatched `}`
-error [14; 15): unmatched `}`
-error [29; 30): unmatched `}`
+error [0; 0): unmatched `}`
+error [14; 14): unmatched `}`
+error [29; 29): unmatched `}`
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt
index 071786b3c..98248227d 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt
@@ -76,6 +76,6 @@ SOURCE_FILE@[0; 95)
         WHITESPACE@[92; 93) "\n"
         R_CURLY@[93; 94) "}"
   WHITESPACE@[94; 95) "\n"
-error [17; 18): expected EXCL
-error [19; 20): expected SEMI
-error [20; 21): expected an item
+error [17; 17): expected EXCL
+error [19; 19): expected SEMI
+error [20; 20): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.txt b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.txt
index 04a091fb9..ca508ac7c 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.txt
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.txt
@@ -45,14 +45,14 @@ SOURCE_FILE@[0; 43)
       IDENT@[40; 41) "T"
     SEMI@[41; 42) ";"
   WHITESPACE@[42; 43) "\n"
-error [9; 10): expected type parameter
-error [11; 12): expected COMMA
-error [11; 12): expected R_ANGLE
-error [11; 12): expected `;`, `{`, or `(`
-error [12; 13): expected an item
-error [14; 15): expected an item
-error [15; 16): expected an item
-error [17; 18): expected an item
-error [24; 25): expected SEMI
-error [24; 25): expected expression
-error [25; 26): expected SEMI
+error [9; 9): expected type parameter
+error [11; 11): expected COMMA
+error [11; 11): expected R_ANGLE
+error [11; 11): expected `;`, `{`, or `(`
+error [12; 12): expected an item
+error [14; 14): expected an item
+error [15; 15): expected an item
+error [17; 17): expected an item
+error [24; 24): expected SEMI
+error [24; 24): expected expression
+error [25; 25): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.txt b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.txt
index e2316c52d..e0edf6a2d 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.txt
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.txt
@@ -40,4 +40,4 @@ SOURCE_FILE@[0; 42)
         WHITESPACE@[39; 40) "\n"
         R_CURLY@[40; 41) "}"
   WHITESPACE@[41; 42) "\n"
-error [24; 25): expected `{`
+error [24; 24): expected `{`
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.txt b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.txt
index f082ed40d..900894dcf 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.txt
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.txt
@@ -10,4 +10,4 @@ SOURCE_FILE@[0; 19)
       IDENT@[14; 17) "Foo"
     SEMI@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
-error [6; 7): expected existential, fn, trait or impl
+error [6; 6): expected existential, fn, trait or impl
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
index 06c9f7cf8..7a934cf66 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
@@ -69,21 +69,21 @@ SOURCE_FILE@[0; 86)
   ERROR@[83; 84)
     SEMI@[83; 84) ";"
   WHITESPACE@[84; 86) "\n\n"
-error [67; 68): expected type
-error [68; 69): expected COMMA
-error [68; 69): expected R_ANGLE
-error [68; 69): expected COMMA
-error [68; 69): expected R_ANGLE
-error [68; 69): expected COMMA
-error [68; 69): expected R_ANGLE
-error [68; 69): expected COMMA
-error [72; 73): expected COMMA
-error [72; 73): expected a type
-error [72; 73): expected R_PAREN
-error [72; 73): expected SEMI
-error [72; 73): expected an item
-error [73; 74): expected an item
-error [79; 80): expected an item
-error [80; 81): expected an item
-error [82; 83): expected an item
-error [83; 84): expected an item
+error [67; 67): expected type
+error [68; 68): expected COMMA
+error [68; 68): expected R_ANGLE
+error [68; 68): expected COMMA
+error [68; 68): expected R_ANGLE
+error [68; 68): expected COMMA
+error [68; 68): expected R_ANGLE
+error [68; 68): expected COMMA
+error [72; 72): expected COMMA
+error [72; 72): expected a type
+error [72; 72): expected R_PAREN
+error [72; 72): expected SEMI
+error [72; 72): expected an item
+error [73; 73): expected an item
+error [79; 79): expected an item
+error [80; 80): expected an item
+error [82; 82): expected an item
+error [83; 83): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.txt b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.txt
index 690fdd322..a25d641b8 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.txt
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.txt
@@ -29,4 +29,4 @@ SOURCE_FILE@[0; 23)
         L_CURLY@[20; 21) "{"
         R_CURLY@[21; 22) "}"
   WHITESPACE@[22; 23) "\n"
-error [19; 20): expected colon
+error [19; 19): expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.txt b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.txt
index 583de5f00..36b848be3 100644
--- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.txt
+++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.txt
@@ -16,9 +16,9 @@ SOURCE_FILE@[0; 14)
     WHITESPACE@[11; 12) "\n"
     R_CURLY@[12; 13) "}"
   WHITESPACE@[13; 14) "\n"
-error [7; 8): expected value parameter
-error [7; 8): expected R_PAREN
-error [7; 8): expected a block
-error [7; 8): unmatched `}`
-error [8; 9): expected an item
-error [10; 11): expected an item
+error [7; 7): expected value parameter
+error [7; 7): expected R_PAREN
+error [7; 7): expected a block
+error [7; 7): unmatched `}`
+error [8; 8): expected an item
+error [10; 10): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.txt b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.txt
index 83bb0e0fe..6343580e0 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.txt
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.txt
@@ -41,4 +41,4 @@ SOURCE_FILE@[0; 56)
         WHITESPACE@[53; 54) "\n"
         R_CURLY@[54; 55) "}"
   WHITESPACE@[55; 56) "\n"
-error [38; 39): expected SEMI
+error [38; 38): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.txt b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.txt
index 7423c2d61..59480e999 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.txt
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.txt
@@ -44,4 +44,4 @@ SOURCE_FILE@[0; 47)
         WHITESPACE@[44; 45) "\n"
         R_CURLY@[45; 46) "}"
   WHITESPACE@[46; 47) "\n"
-error [44; 45): expected expression
+error [44; 44): expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
index 81d445254..b9e60f6c1 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
@@ -125,8 +125,8 @@ SOURCE_FILE@[0; 183)
       WHITESPACE@[180; 181) "\n"
       R_CURLY@[181; 182) "}"
   WHITESPACE@[182; 183) "\n"
-error [34; 35): expected pattern
-error [34; 35): expected COLON
-error [34; 35): expected type
-error [180; 181): expected function arguments
-error [180; 181): expected a block
+error [34; 34): expected pattern
+error [34; 34): expected COLON
+error [34; 34): expected type
+error [180; 180): expected function arguments
+error [180; 180): expected a block
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.txt b/crates/ra_syntax/test_data/parser/err/0019_let_recover.txt
index 3e6f82dc4..97e91a94f 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.txt
@@ -95,13 +95,13 @@ SOURCE_FILE@[0; 139)
         WHITESPACE@[136; 137) "\n"
         R_CURLY@[137; 138) "}"
   WHITESPACE@[138; 139) "\n"
-error [24; 25): expected expression
-error [24; 25): expected SEMI
-error [49; 50): expected pattern
-error [49; 50): expected SEMI
-error [75; 76): expected pattern
-error [75; 76): expected SEMI
-error [98; 99): expected pattern
-error [98; 99): expected SEMI
-error [124; 125): expected pattern
-error [124; 125): expected SEMI
+error [24; 24): expected expression
+error [24; 24): expected SEMI
+error [49; 49): expected pattern
+error [49; 49): expected SEMI
+error [75; 75): expected pattern
+error [75; 75): expected SEMI
+error [98; 98): expected pattern
+error [98; 98): expected SEMI
+error [124; 124): expected pattern
+error [124; 124): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.txt b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.txt
index 1ef36c9bd..c11dc23f5 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.txt
@@ -16,6 +16,6 @@ SOURCE_FILE@[0; 16)
         L_CURLY@[13; 14) "{"
         R_CURLY@[14; 15) "}"
   WHITESPACE@[15; 16) "\n"
-error [2; 3): expected a name
-error [2; 3): expected function arguments
-error [2; 3): expected a block
+error [2; 2): expected a name
+error [2; 2): expected function arguments
+error [2; 2): expected a block
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.txt b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.txt
index 8035b8711..ae04122d8 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.txt
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.txt
@@ -31,5 +31,5 @@ SOURCE_FILE@[0; 22)
         WHITESPACE@[19; 20) "\n"
         R_CURLY@[20; 21) "}"
   WHITESPACE@[21; 22) "\n"
-error [16; 17): expected COLON
-error [16; 17): expected type
+error [16; 16): expected COLON
+error [16; 16): expected type
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.txt b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.txt
index e4f318957..bb87022b0 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.txt
@@ -148,36 +148,36 @@ SOURCE_FILE@[0; 112)
         WHITESPACE@[109; 110) " "
         R_CURLY@[110; 111) "}"
   WHITESPACE@[111; 112) "\n"
-error [16; 17): expected expression
-error [17; 18): expected R_BRACK
-error [17; 18): expected SEMI
-error [17; 18): expected expression
-error [18; 19): expected SEMI
-error [25; 26): expected a name
-error [26; 27): expected `;`, `{`, or `(`
-error [30; 31): expected pattern
-error [31; 32): expected SEMI
-error [53; 54): expected expression
-error [54; 55): expected SEMI
-error [54; 55): expected expression
-error [55; 56): expected SEMI
-error [60; 61): expected type
-error [60; 61): expected `{`
-error [60; 61): expected expression
-error [61; 62): expected SEMI
-error [65; 66): expected pattern
-error [65; 66): expected SEMI
-error [65; 66): expected expression
-error [92; 93): expected expression
-error [93; 94): expected SEMI
-error [93; 94): expected expression
-error [94; 95): expected SEMI
-error [95; 96): expected expression
-error [96; 97): expected SEMI
-error [96; 97): expected expression
-error [97; 98): expected SEMI
-error [103; 104): expected a name
-error [104; 105): expected `{`
-error [108; 109): expected pattern
-error [108; 109): expected SEMI
-error [108; 109): expected expression
+error [16; 16): expected expression
+error [17; 17): expected R_BRACK
+error [17; 17): expected SEMI
+error [17; 17): expected expression
+error [18; 18): expected SEMI
+error [25; 25): expected a name
+error [26; 26): expected `;`, `{`, or `(`
+error [30; 30): expected pattern
+error [31; 31): expected SEMI
+error [53; 53): expected expression
+error [54; 54): expected SEMI
+error [54; 54): expected expression
+error [55; 55): expected SEMI
+error [60; 60): expected type
+error [60; 60): expected `{`
+error [60; 60): expected expression
+error [61; 61): expected SEMI
+error [65; 65): expected pattern
+error [65; 65): expected SEMI
+error [65; 65): expected expression
+error [92; 92): expected expression
+error [93; 93): expected SEMI
+error [93; 93): expected expression
+error [94; 94): expected SEMI
+error [95; 95): expected expression
+error [96; 96): expected SEMI
+error [96; 96): expected expression
+error [97; 97): expected SEMI
+error [103; 103): expected a name
+error [104; 104): expected `{`
+error [108; 108): expected pattern
+error [108; 108): expected SEMI
+error [108; 108): expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.txt b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.txt
index 7616ca59c..775e4b0da 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.txt
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.txt
@@ -40,5 +40,5 @@ SOURCE_FILE@[0; 94)
   ERROR@[92; 93)
     R_CURLY@[92; 93) "}"
   WHITESPACE@[93; 94) "\n"
-error [49; 50): unmatched `}`
-error [92; 93): unmatched `}`
+error [49; 49): unmatched `}`
+error [92; 92): unmatched `}`
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.txt b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.txt
index c4170e9d8..c5c8a29ba 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.txt
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.txt
@@ -290,32 +290,32 @@ SOURCE_FILE@[0; 240)
         WHITESPACE@[237; 238) "\n"
         R_CURLY@[238; 239) "}"
   WHITESPACE@[239; 240) "\n"
-error [88; 89): expected COMMA
-error [88; 89): expected R_ANGLE
-error [121; 122): expected SEMI
-error [121; 122): expected expression
-error [140; 141): expected type
-error [141; 142): expected R_PAREN
-error [141; 142): expected COMMA
-error [141; 142): expected R_ANGLE
-error [141; 142): expected SEMI
-error [146; 147): expected SEMI
-error [146; 147): expected expression
-error [147; 148): expected SEMI
-error [148; 149): expected expression
-error [149; 150): expected SEMI
-error [154; 155): expected pattern
-error [155; 156): expected IN_KW
-error [155; 156): expected expression
-error [157; 158): expected a block
-error [165; 166): expected expression
-error [168; 169): expected expression
-error [179; 180): expected expression
-error [180; 181): expected COMMA
-error [180; 181): expected expression
-error [180; 181): expected R_PAREN
-error [180; 181): expected SEMI
-error [215; 216): expected COMMA
-error [215; 216): expected R_ANGLE
-error [235; 236): expected SEMI
-error [235; 236): expected expression
+error [88; 88): expected COMMA
+error [88; 88): expected R_ANGLE
+error [121; 121): expected SEMI
+error [121; 121): expected expression
+error [140; 140): expected type
+error [141; 141): expected R_PAREN
+error [141; 141): expected COMMA
+error [141; 141): expected R_ANGLE
+error [141; 141): expected SEMI
+error [146; 146): expected SEMI
+error [146; 146): expected expression
+error [147; 147): expected SEMI
+error [148; 148): expected expression
+error [149; 149): expected SEMI
+error [154; 154): expected pattern
+error [155; 155): expected IN_KW
+error [155; 155): expected expression
+error [157; 157): expected a block
+error [165; 165): expected expression
+error [168; 168): expected expression
+error [179; 179): expected expression
+error [180; 180): expected COMMA
+error [180; 180): expected expression
+error [180; 180): expected R_PAREN
+error [180; 180): expected SEMI
+error [215; 215): expected COMMA
+error [215; 215): expected R_ANGLE
+error [235; 235): expected SEMI
+error [235; 235): expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.txt b/crates/ra_syntax/test_data/parser/err/0025_nope.txt
index 5ece9489b..ca7f2d255 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.txt
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.txt
@@ -191,14 +191,14 @@ SOURCE_FILE@[0; 575)
         WHITESPACE@[572; 573) "\n"
         R_CURLY@[573; 574) "}"
   WHITESPACE@[574; 575) "\n"
-error [95; 96): expected type
-error [95; 96): expected COMMA
-error [96; 97): expected field
-error [98; 99): expected field declaration
-error [371; 372): expected COMMA
-error [372; 373): expected a type
-error [372; 373): expected R_PAREN
-error [372; 373): expected COMMA
-error [372; 373): expected enum variant
-error [374; 375): expected enum variant
-error [508; 509): expected expression
+error [95; 95): expected type
+error [95; 95): expected COMMA
+error [96; 96): expected field
+error [98; 98): expected field declaration
+error [371; 371): expected COMMA
+error [372; 372): expected a type
+error [372; 372): expected R_PAREN
+error [372; 372): expected COMMA
+error [372; 372): expected enum variant
+error [374; 374): expected enum variant
+error [508; 508): expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.txt b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.txt
index 46985fc8e..3942e0904 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.txt
@@ -45,5 +45,5 @@ SOURCE_FILE@[0; 38)
       L_CURLY@[35; 36) "{"
       R_CURLY@[36; 37) "}"
   WHITESPACE@[37; 38) "\n"
-error [14; 15): expected trait or type
-error [14; 15): expected `{`
+error [14; 14): expected trait or type
+error [14; 14): expected `{`
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.txt b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.txt
index 26f10d426..4a28bcabf 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.txt
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.txt
@@ -25,5 +25,5 @@ SOURCE_FILE@[0; 30)
         L_CURLY@[27; 28) "{"
         R_CURLY@[28; 29) "}"
   WHITESPACE@[29; 30) "\n"
-error [26; 27): expected a path
-error [26; 27): expected colon
+error [26; 26): expected a path
+error [26; 26): expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.txt b/crates/ra_syntax/test_data/parser/err/0029_field_completion.txt
index ab300283f..177849476 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.txt
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.txt
@@ -33,4 +33,4 @@ SOURCE_FILE@[0; 24)
         WHITESPACE@[21; 22) "\n"
         R_CURLY@[22; 23) "}"
   WHITESPACE@[23; 24) "\n"
-error [21; 22): expected field name or number
+error [21; 21): expected field name or number
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.txt b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.txt
index eb9d632ad..c36e2f770 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.txt
@@ -191,14 +191,14 @@ SOURCE_FILE@[0; 293)
         WHITESPACE@[290; 291) "\n"
         R_CURLY@[291; 292) "}"
   WHITESPACE@[292; 293) "\n"
-error [52; 53): expected `[`
-error [52; 53): expected pattern
-error [53; 54): expected FAT_ARROW
-error [78; 79): expected COMMA
-error [161; 162): expected `[`
-error [161; 162): expected pattern
-error [162; 163): expected FAT_ARROW
-error [232; 233): expected `[`
-error [232; 233): expected pattern
-error [233; 234): expected FAT_ARROW
-error [250; 251): expected COMMA
+error [52; 52): expected `[`
+error [52; 52): expected pattern
+error [53; 53): expected FAT_ARROW
+error [78; 78): expected COMMA
+error [161; 161): expected `[`
+error [161; 161): expected pattern
+error [162; 162): expected FAT_ARROW
+error [232; 232): expected `[`
+error [232; 232): expected pattern
+error [233; 233): expected FAT_ARROW
+error [250; 250): expected COMMA
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.txt b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.txt
index 33eeee763..e914e688b 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.txt
@@ -62,6 +62,6 @@ SOURCE_FILE@[0; 89)
         WHITESPACE@[86; 87) "\n"
         R_CURLY@[87; 88) "}"
   WHITESPACE@[88; 89) "\n"
-error [80; 81): expected pattern
-error [80; 81): expected FAT_ARROW
-error [80; 81): expected expression
+error [80; 80): expected pattern
+error [80; 80): expected FAT_ARROW
+error [80; 80): expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt
index 301339244..2c91b6841 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt
@@ -88,9 +88,9 @@ SOURCE_FILE@[0; 91)
         WHITESPACE@[87; 88) "\n"
         R_CURLY@[88; 89) "}"
   WHITESPACE@[89; 91) "\n\n"
-error [24; 25): expected a name
-error [27; 28): expected SEMI
-error [48; 49): expected a name
-error [51; 52): expected SEMI
-error [76; 77): expected a name
-error [79; 80): expected SEMI
+error [24; 24): expected a name
+error [27; 27): expected SEMI
+error [48; 48): expected a name
+error [51; 51): expected SEMI
+error [76; 76): expected a name
+error [79; 79): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt b/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt
index 93365a532..8cb4ea796 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 48)
         L_CURLY@[45; 46) "{"
         R_CURLY@[46; 47) "}"
   WHITESPACE@[47; 48) "\n"
-error [17; 18): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [17; 18): expected SEMI
-error [37; 38): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [37; 38): expected SEMI
+error [17; 17): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error [17; 17): expected SEMI
+error [37; 37): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error [37; 37): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt b/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt
index e7348f911..f5490fbe8 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt
@@ -39,13 +39,13 @@ SOURCE_FILE@[0; 37)
         ERROR@[35; 36)
           SEMI@[35; 36) ";"
   WHITESPACE@[36; 37) "\n"
-error [22; 23): expected COMMA
-error [22; 23): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [23; 24): expected COMMA
-error [24; 25): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [27; 28): expected COMMA
-error [35; 36): expected COMMA
-error [35; 36): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [36; 37): expected COMMA
-error [36; 37): expected R_CURLY
-error [36; 37): expected SEMI
+error [22; 22): expected COMMA
+error [22; 22): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error [23; 23): expected COMMA
+error [24; 24): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error [27; 27): expected COMMA
+error [35; 35): expected COMMA
+error [35; 35): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error [36; 36): expected COMMA
+error [36; 36): expected R_CURLY
+error [36; 36): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.txt b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.txt
index e0a95f0d3..4a2f0a696 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.txt
@@ -80,4 +80,4 @@ SOURCE_FILE@[0; 83)
         WHITESPACE@[80; 81) "\n"
         R_CURLY@[81; 82) "}"
   WHITESPACE@[82; 83) "\n"
-error [56; 57): expected expression
+error [56; 56): expected expression
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.txt b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.txt
index b3baee30d..530533b71 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.txt
@@ -20,8 +20,8 @@ SOURCE_FILE@[0; 18)
   ERROR@[16; 17)
     SEMI@[16; 17) ";"
   WHITESPACE@[17; 18) "\n"
-error [12; 13): expected `;` or `]`
-error [12; 13): expected SEMI
-error [13; 14): expected an item
-error [15; 16): expected an item
-error [16; 17): expected an item
+error [12; 12): expected `;` or `]`
+error [12; 12): expected SEMI
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.txt
index 50f37416e..0187d872d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.txt
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 30)
         WHITESPACE@[27; 28) "\n"
         R_CURLY@[28; 29) "}"
   WHITESPACE@[29; 30) "\n"
-error [22; 23): expected a loop
-error [22; 23): expected SEMI
-error [27; 28): expected type
-error [27; 28): expected `{`
+error [22; 22): expected a loop
+error [22; 22): expected SEMI
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.txt
index c770166eb..2ab29eecc 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.txt
@@ -14,4 +14,4 @@ SOURCE_FILE@[0; 14)
         R_PAREN@[11; 12) ")"
     SEMI@[12; 13) ";"
   WHITESPACE@[13; 14) "\n"
-error [10; 11): expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.txt
index c1eac055a..d5aea05c2 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.txt
@@ -73,7 +73,7 @@ SOURCE_FILE@[0; 87)
       L_CURLY@[84; 85) "{"
       R_CURLY@[85; 86) "}"
   WHITESPACE@[86; 87) "\n"
-error [38; 39): expected trait or type
-error [38; 39): expected `{`
-error [70; 71): expected trait or type
-error [70; 71): expected `{`
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
index 961648a1d..9e9186ad4 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
@@ -16,8 +16,8 @@ SOURCE_FILE@[0; 20)
   ERROR@[18; 19)
     SEMI@[18; 19) ";"
   WHITESPACE@[19; 20) "\n"
-error [15; 16): expected `fn`
-error [15; 16): expected SEMI
-error [16; 17): expected an item
-error [17; 18): expected an item
-error [18; 19): expected an item
+error [15; 15): expected `fn`
+error [15; 15): expected SEMI
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.txt
index 3e5a36db8..690acdca3 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.txt
@@ -33,5 +33,5 @@ SOURCE_FILE@[0; 33)
         L_CURLY@[30; 31) "{"
         R_CURLY@[31; 32) "}"
   WHITESPACE@[32; 33) "\n"
-error [11; 12): expected an item
-error [18; 19): expected an item
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.txt
index 8b7fd43ae..a4002a998 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.txt
@@ -29,4 +29,4 @@ SOURCE_FILE@[0; 30)
         WHITESPACE@[27; 28) " "
         R_CURLY@[28; 29) "}"
   WHITESPACE@[29; 30) "\n"
-error [27; 28): expected SEMI
+error [27; 27): expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.txt b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.txt
index 63362e74b..6f45a4fa6 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.txt
@@ -23,4 +23,4 @@ SOURCE_FILE@[0; 21)
         WHITESPACE@[18; 19) " "
         R_CURLY@[19; 20) "}"
   WHITESPACE@[20; 21) "\n"
-error [14; 15): expected an item
+error [14; 14): expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.txt b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.txt
index 736a2f40e..e6d3a5c95 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.txt
@@ -57,5 +57,5 @@ SOURCE_FILE@[0; 48)
         WHITESPACE@[45; 46) "\n"
         R_CURLY@[46; 47) "}"
   WHITESPACE@[47; 48) "\n"
-error [24; 25): attributes are not allowed on BIN_EXPR
-error [44; 45): attributes are not allowed on IF_EXPR
+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_wrong_order_fns.txt b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt
index 289193b9e..f6ac0feaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt
@@ -37,5 +37,5 @@ SOURCE_FILE@[0; 50)
         L_CURLY@[47; 48) "{"
         R_CURLY@[48; 49) "}"
   WHITESPACE@[49; 50) "\n"
-error 6: expected existential, fn, trait or impl
-error 31: expected existential, fn, trait or impl
+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.txt b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.txt
index 58fafff13..5b3dc5af2 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.txt
@@ -18,4 +18,4 @@ SOURCE_FILE@[0; 19)
       INT_NUMBER@[16; 17) "5"
     SEMI@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
-error [7; 8): expected a name
+error [7; 7): expected a name
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.txt b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.txt
index ff53f8f4c..25d80be1d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.txt
@@ -51,9 +51,9 @@ SOURCE_FILE@[0; 62)
       WHITESPACE@[59; 60) "\n"
       R_CURLY@[60; 61) "}"
   WHITESPACE@[61; 62) "\n"
-error [21; 22): expected EXCL
-error [21; 22): expected `{`, `[`, `(`
-error [21; 22): expected SEMI
-error [47; 48): expected EXCL
-error [47; 48): expected `{`, `[`, `(`
-error [47; 48): expected SEMI
+error [21; 21): expected EXCL
+error [21; 21): expected `{`, `[`, `(`
+error [21; 21): expected SEMI
+error [47; 47): expected EXCL
+error [47; 47): expected `{`, `[`, `(`
+error [47; 47): expected SEMI