Skip to content

Commit badfde1

Browse files
authored
parser: cleanup dupe b_expr funcs (#750)
1 parent ed79308 commit badfde1

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

crates/squawk_parser/src/grammar.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -300,16 +300,6 @@ fn overlay_fn(p: &mut Parser<'_>) -> CompletedMarker {
300300
// cause trouble in the places where b_expr is used.
301301
fn position_fn(p: &mut Parser<'_>) -> CompletedMarker {
302302
assert!(p.at(POSITION_KW));
303-
fn b_expr(r: &mut Parser<'_>) -> Option<CompletedMarker> {
304-
expr_bp(
305-
r,
306-
1,
307-
&Restrictions {
308-
in_disabled: true,
309-
..Restrictions::default()
310-
},
311-
)
312-
}
313303
let m = p.start();
314304
p.expect(POSITION_KW);
315305
p.expect(L_PAREN);
@@ -1419,7 +1409,7 @@ fn lhs(p: &mut Parser<'_>, r: &Restrictions) -> Option<CompletedMarker> {
14191409
}
14201410
};
14211411
// parse the interior of the unary expression
1422-
let _ = expr_bp(p, prefix_bp, &Restrictions::default());
1412+
expr_bp(p, prefix_bp, &Restrictions::default());
14231413
let cm = m.complete(p, kind);
14241414
Some(cm)
14251415
}
@@ -2127,9 +2117,9 @@ fn between_expr(p: &mut Parser<'_>) -> CompletedMarker {
21272117
p.eat(NOT_KW);
21282118
p.expect(BETWEEN_KW);
21292119
p.eat(SYMMETRIC_KW);
2130-
bexpr(p);
2120+
b_expr(p);
21312121
p.expect(AND_KW);
2132-
bexpr(p);
2122+
b_expr(p);
21332123
m.complete(p, BETWEEN_EXPR)
21342124
}
21352125

@@ -2315,8 +2305,7 @@ fn opt_expr(p: &mut Parser<'_>) -> Option<CompletedMarker> {
23152305

23162306
// Based on the Postgres grammar b_expr, it's expr without `AND`, `NOT`, `IS`,
23172307
// and `IN`
2318-
#[must_use]
2319-
fn bexpr(p: &mut Parser<'_>) -> Option<CompletedMarker> {
2308+
fn b_expr(p: &mut Parser<'_>) -> Option<CompletedMarker> {
23202309
expr_bp(
23212310
p,
23222311
1,
@@ -2477,7 +2466,6 @@ struct Restrictions {
24772466
and_disabled: bool,
24782467
}
24792468

2480-
#[must_use]
24812469
fn expr_bp(p: &mut Parser<'_>, bp: u8, r: &Restrictions) -> Option<CompletedMarker> {
24822470
let m = p.start();
24832471
if !p.at_ts(EXPR_FIRST) {

0 commit comments

Comments
 (0)