Merge #3026

3026: ra_syntax: reshape SyntaxError for the sake of removing redundancy r=matklad a=Veetaha

Followup of #2911, also puts some crosses to the todo list of #223.

**AHTUNG!** A big part of the diff of this PR are test data files changes.

Simplified `SyntaxError` that was `SyntaxError { kind: { /* big enum */  }, location: Location }` to `SyntaxError(String, TextRange)`. I am not sure whether the tuple struct here is best fit, I am inclined to add names to the fields, because I already provide getters `SyntaxError::message()`, `SyntaxError::range()`.
I also removed `Location` altogether ...

This is currently WIP, because the following is not done:
- [ ] ~~Add tests to `test_data` dir for unescape errors *// I don't know where to put these errors in particular, because they are out of the scope of the lexer and parser. However, I have an idea in mind that we move all validators we have right now to parsing stage, but this is up to discussion...*~~ **[UPD]** I came to a conclusion that tree validation logic, which unescape errors are a part of, should be rethought of, we currently have no tests and no place to put tests for tree validations. So I'd like to extract potential redesign (maybe move of tree validation to ra_parser) and adding tests for this into a separate task.

Co-authored-by: Veetaha <[email protected]>
Co-authored-by: Veetaha <[email protected]>

35 files changed, 211 insertions, 211 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 dc143945a..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: 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 181bcdb9e..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: expected an item
-error 3: 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 bdb5fa6c5..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: expected `[`
-error 23: expected an item
-error 27: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error 28: expected SEMI
-error 31: expected EXCL
-error 31: expected `{`, `[`, `(`
-error 31: expected SEMI
-error 31: expected an item
-error 35: expected EXCL
-error 41: expected `{`, `[`, `(`
-error 41: 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 58d005902..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: 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 5210a884d..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: 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 7c1a23170..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: expected R_PAREN
-error 53: expected `]`
-error 53: 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 5f5198b31..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: expected field declaration
-error 33: expected COMMA
-error 38: expected field declaration
-error 39: expected COMMA
-error 40: expected field declaration
-error 41: expected COMMA
-error 42: expected field declaration
-error 43: 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 7ae417441..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: unmatched `}`
-error 14: unmatched `}`
-error 29: 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 1a4b40a2b..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: expected EXCL
-error 19: expected SEMI
-error 20: 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 e147d6424..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: expected type parameter
-error 11: expected COMMA
-error 11: expected R_ANGLE
-error 11: expected `;`, `{`, or `(`
-error 12: expected an item
-error 14: expected an item
-error 15: expected an item
-error 17: expected an item
-error 24: expected SEMI
-error 24: expected expression
-error 25: 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 b73dda5ad..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: 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 381147dc0..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: 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 4907bac6d..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: expected type
-error 68: expected COMMA
-error 68: expected R_ANGLE
-error 68: expected COMMA
-error 68: expected R_ANGLE
-error 68: expected COMMA
-error 68: expected R_ANGLE
-error 68: expected COMMA
-error 72: expected COMMA
-error 72: expected a type
-error 72: expected R_PAREN
-error 72: expected SEMI
-error 72: expected an item
-error 73: expected an item
-error 79: expected an item
-error 80: expected an item
-error 82: expected an item
-error 83: 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 0ba17cf8d..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: 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 23ca0c446..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: expected value parameter
-error 7: expected R_PAREN
-error 7: expected a block
-error 7: unmatched `}`
-error 8: expected an item
-error 10: 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 bc5be6a66..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: 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 9033a5b38..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: 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 d12f4c99b..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: expected pattern
-error 34: expected COLON
-error 34: expected type
-error 180: expected function arguments
-error 180: 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 cc3578e54..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: expected expression
-error 24: expected SEMI
-error 49: expected pattern
-error 49: expected SEMI
-error 75: expected pattern
-error 75: expected SEMI
-error 98: expected pattern
-error 98: expected SEMI
-error 124: expected pattern
-error 124: 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 70727d059..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: expected a name
-error 2: expected function arguments
-error 2: 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 333782480..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: expected COLON
-error 16: 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 cb45eb2fc..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: expected expression
-error 17: expected R_BRACK
-error 17: expected SEMI
-error 17: expected expression
-error 18: expected SEMI
-error 25: expected a name
-error 26: expected `;`, `{`, or `(`
-error 30: expected pattern
-error 31: expected SEMI
-error 53: expected expression
-error 54: expected SEMI
-error 54: expected expression
-error 55: expected SEMI
-error 60: expected type
-error 60: expected `{`
-error 60: expected expression
-error 61: expected SEMI
-error 65: expected pattern
-error 65: expected SEMI
-error 65: expected expression
-error 92: expected expression
-error 93: expected SEMI
-error 93: expected expression
-error 94: expected SEMI
-error 95: expected expression
-error 96: expected SEMI
-error 96: expected expression
-error 97: expected SEMI
-error 103: expected a name
-error 104: expected `{`
-error 108: expected pattern
-error 108: expected SEMI
-error 108: 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 6dd04f80e..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: unmatched `}`
-error 92: 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 0a93e11a5..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: expected COMMA
-error 88: expected R_ANGLE
-error 121: expected SEMI
-error 121: expected expression
-error 140: expected type
-error 141: expected R_PAREN
-error 141: expected COMMA
-error 141: expected R_ANGLE
-error 141: expected SEMI
-error 146: expected SEMI
-error 146: expected expression
-error 147: expected SEMI
-error 148: expected expression
-error 149: expected SEMI
-error 154: expected pattern
-error 155: expected IN_KW
-error 155: expected expression
-error 157: expected a block
-error 165: expected expression
-error 168: expected expression
-error 179: expected expression
-error 180: expected COMMA
-error 180: expected expression
-error 180: expected R_PAREN
-error 180: expected SEMI
-error 215: expected COMMA
-error 215: expected R_ANGLE
-error 235: expected SEMI
-error 235: 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 8369f4bda..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: expected type
-error 95: expected COMMA
-error 96: expected field
-error 98: expected field declaration
-error 371: expected COMMA
-error 372: expected a type
-error 372: expected R_PAREN
-error 372: expected COMMA
-error 372: expected enum variant
-error 374: expected enum variant
-error 508: 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 d3da2f54f..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: expected trait or type
-error 14: 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 9298b45a4..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: expected a path
-error 26: 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 e3e1282ec..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: 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 dbc0081ac..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: expected `[`
-error 52: expected pattern
-error 53: expected FAT_ARROW
-error 78: expected COMMA
-error 161: expected `[`
-error 161: expected pattern
-error 162: expected FAT_ARROW
-error 232: expected `[`
-error 232: expected pattern
-error 233: expected FAT_ARROW
-error 250: 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 fd5ccc3f2..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: expected pattern
-error 80: expected FAT_ARROW
-error 80: 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 21269fb02..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: expected a name
-error 27: expected SEMI
-error 48: expected a name
-error 51: expected SEMI
-error 76: expected a name
-error 79: 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 636840828..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: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error 17: expected SEMI
-error 37: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error 37: 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 181f408c8..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: expected COMMA
-error 22: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error 23: expected COMMA
-error 24: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error 27: expected COMMA
-error 35: expected COMMA
-error 35: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error 36: expected COMMA
-error 36: expected R_CURLY
-error 36: 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/0037_visibility_in_traits.txt b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.txt
index 749c8cddb..d0a128a5f 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.txt
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.txt
@@ -94,6 +94,6 @@ SOURCE_FILE@[0; 118)
       WHITESPACE@[115; 116) "\n"
       R_CURLY@[116; 117) "}"
   WHITESPACE@[117; 118) "\n"
-error [36; 39): unnecessary visibility qualifier
-error [56; 66): unnecessary visibility qualifier
-error [86; 96): unnecessary visibility qualifier
+error [36; 39): Unnecessary visibility qualifier
+error [56; 66): Unnecessary visibility qualifier
+error [86; 96): Unnecessary visibility qualifier
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 d1544634c..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: expected expression
+error [56; 56): expected expression