diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-18 09:32:28 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-18 09:32:28 +0000 |
commit | 1cd18f9237b6ac48ca8461307f2a4eaf273ee394 (patch) | |
tree | 7971e3753c74b98e0e5b4120adb8706a86d99e3e /crates/ra_syntax/tests/data/parser/err | |
parent | 7c117567ab55046a9303fc7a6676a50008ad4f33 (diff) | |
parent | 76075c74103b3204ebc1bde54a330629d9e00811 (diff) |
Merge #991
991: Use Marker argument for item parsers r=matklad a=pcpthm
Before doing this for expressions, I found that the pattern (Marker argument) should be applied to the item parsers because visiblity and modifiers are parsed in a separate function.
Fixed some parser bugs:
- Fix pub_expr: `pub 42;` was allowed.
- Fix incorrect parsing of crate::path: incorrectly parsed as `crate` as a visibility.
Co-authored-by: pcpthm <[email protected]>
Diffstat (limited to 'crates/ra_syntax/tests/data/parser/err')
-rw-r--r-- | crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt index e9400d03b..b87fe46bd 100644 --- a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt +++ b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | SOURCE_FILE@[0; 40) | 1 | SOURCE_FILE@[0; 40) |
2 | STRUCT_DEF@[0; 40) | 2 | STRUCT_DEF@[0; 39) |
3 | STRUCT_KW@[0; 6) | 3 | STRUCT_KW@[0; 6) |
4 | WHITESPACE@[6; 7) | 4 | WHITESPACE@[6; 7) |
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
@@ -35,5 +35,5 @@ SOURCE_FILE@[0; 40) | |||
35 | R_CURLY@[38; 39) | 35 | R_CURLY@[38; 39) |
36 | err: `expected item, found `;` | 36 | err: `expected item, found `;` |
37 | consider removing this semicolon` | 37 | consider removing this semicolon` |
38 | ERROR@[39; 40) | 38 | ERROR@[39; 40) |
39 | SEMI@[39; 40) | 39 | SEMI@[39; 40) |