Skip to content

Commit 2532c48

Browse files
authored
Merge pull request #21518 from pksunkara/pavan/jj/uwxtukzt
internal: Use parser expect where possible
2 parents cc76a8a + 8efe106 commit 2532c48

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

crates/parser/src/grammar/attributes.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,11 @@ fn attr(p: &mut Parser<'_>, inner: bool) {
2424
p.bump(T![!]);
2525
}
2626

27-
if p.eat(T!['[']) {
27+
if p.expect(T!['[']) {
2828
meta(p);
29-
30-
if !p.eat(T![']']) {
31-
p.error("expected `]`");
32-
}
33-
} else {
34-
p.error("expected `[`");
29+
p.expect(T![']']);
3530
}
31+
3632
attr.complete(p, ATTR);
3733
}
3834

crates/parser/test_data/parser/err/0002_duplicate_shebang.rast

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SOURCE_FILE
2828
NAME_REF
2929
IDENT "rusti"
3030
WHITESPACE "\n"
31-
error 23: expected `[`
31+
error 23: expected L_BRACK
3232
error 23: expected an item
3333
error 27: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
3434
error 28: expected SEMICOLON

crates/parser/test_data/parser/err/0005_attribute_recover.rast

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ SOURCE_FILE
5858
R_CURLY "}"
5959
WHITESPACE "\n"
6060
error 53: expected R_PAREN
61-
error 53: expected `]`
61+
error 53: expected R_BRACK
6262
error 53: expected an item

crates/parser/test_data/parser/err/0032_match_arms_inner_attrs.rast

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ SOURCE_FILE
192192
WHITESPACE "\n"
193193
R_CURLY "}"
194194
WHITESPACE "\n"
195-
error 52: expected `[`
195+
error 52: expected L_BRACK
196196
error 52: expected pattern
197197
error 53: expected FAT_ARROW
198198
error 78: expected `,`
199-
error 161: expected `[`
199+
error 161: expected L_BRACK
200200
error 161: expected pattern
201201
error 162: expected FAT_ARROW
202-
error 232: expected `[`
202+
error 232: expected L_BRACK
203203
error 232: expected pattern
204204
error 233: expected FAT_ARROW
205205
error 250: expected `,`

0 commit comments

Comments
 (0)