Skip to content

Commit ccf737e

Browse files
committed
fix: clippy
1 parent 7fe41a4 commit ccf737e

File tree

8 files changed

+16
-30
lines changed

8 files changed

+16
-30
lines changed

crates/postgresql-cst-parser/src/cst.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ impl Parser {
7676
node: &Node,
7777
peekable: &mut std::iter::Peekable<std::vec::IntoIter<Extra>>,
7878
) {
79-
if cfg!(feature = "remove-empty-node") {
80-
if node.start_byte_pos == node.end_byte_pos && !contains_token(node) {
81-
return;
82-
}
79+
if cfg!(feature = "remove-empty-node")
80+
&& node.start_byte_pos == node.end_byte_pos
81+
&& !contains_token(node)
82+
{
83+
return;
8384
}
8485

8586
while let Some(Extra {
@@ -94,7 +95,7 @@ impl Parser {
9495
// if *start > node.start_byte_pos {
9596
break;
9697
}
97-
self.builder.token(*kind, &comment);
98+
self.builder.token(*kind, comment);
9899
peekable.next();
99100
}
100101

@@ -197,8 +198,7 @@ pub fn parse_with_transformer(
197198

198199
fn next(&mut self) -> Option<Token> {
199200
if self.dummy_token.is_some() {
200-
let dummy_token = self.dummy_token.take();
201-
dummy_token
201+
self.dummy_token.take()
202202
} else {
203203
self.tokens.next()
204204
}

crates/postgresql-cst-parser/src/cst/lr_parse_state.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,11 @@ pub struct LRParseState<'a> {
1313
impl<'a> LRParseState<'a> {
1414
// Determine whether the previous C comment and the token to be processed are adjacent
1515
pub fn adjacent_c_comment(&self) -> bool {
16-
match self.extras.last() {
17-
Some(e)
18-
if e.end_byte_pos != self.token.start_byte_pos
19-
&& e.kind == SyntaxKind::C_COMMENT =>
20-
{
21-
true
22-
}
23-
_ => false,
24-
}
16+
matches!(self.extras.last(), Some(e) if e.end_byte_pos != self.token.start_byte_pos && e.kind == SyntaxKind::C_COMMENT)
2517
}
2618

2719
pub(crate) fn previous_extra(&self) -> Option<&Extra> {
28-
let Some(last_extra) = self.extras.last() else {
29-
return None;
30-
};
20+
let last_extra = self.extras.last()?;
3121

3222
let stack_end_byte_pos = self
3323
.stack

crates/postgresql-cst-parser/src/lexer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl TokenKind {
8989
#[allow(dead_code)]
9090
pub fn to_id(&self) -> String {
9191
match self {
92-
TokenKind::RAW(s) => format!("'{}'", s),
92+
TokenKind::RAW(s) => format!("'{s}'"),
9393
TokenKind::IDENT => "IDENT".to_string(),
9494
TokenKind::KEYWORD(s) => s.to_string(),
9595
TokenKind::C_COMMENT => "C_COMMENT".to_string(),

crates/postgresql-cst-parser/src/transform/missing_from_table.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ fn is_from_table<'a>(lr_parse_state: &LRParseState<'a>) -> bool {
4141
.nth_back(1)
4242
.map(|(_, node)| SyntaxKind::from_raw(RawSyntaxKind(node.component_id)));
4343

44-
if prev2_kind == Some(SyntaxKind::from_list) {
45-
true
46-
} else {
47-
false
48-
}
44+
prev2_kind == Some(SyntaxKind::from_list)
4945
}
5046
_ => false,
5147
}
@@ -67,7 +63,7 @@ impl ParseTransformer for ComplementMissingFromTableTransformer {
6763
return None;
6864
}
6965

70-
if !is_missing_from_replacement_value(&lr_parse_state) {
66+
if !is_missing_from_replacement_value(lr_parse_state) {
7167
return None;
7268
}
7369

crates/postgresql-cst-parser/src/transform/missing_sample_value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl ParseTransformer for ComplementMissingSampleValueTransformer {
3838
return None;
3939
}
4040

41-
if !Self::is_missing_bind_variable(&lr_parse_state) {
41+
if !Self::is_missing_bind_variable(lr_parse_state) {
4242
return None;
4343
}
4444

crates/postgresql-cst-parser/src/transform/skip_extra_comma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl SkipExtraComma {
3939

4040
impl ParseTransformer for SkipExtraComma {
4141
fn transform<'a>(&self, lr_parse_state: &LRParseState<'a>) -> Option<ParseTransform> {
42-
if !Self::allow_extra_comma(&lr_parse_state) {
42+
if !Self::allow_extra_comma(lr_parse_state) {
4343
return None;
4444
}
4545

crates/postgresql-cst-parser/src/transform/skip_extra_operator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ impl SkipExtraOperator {
1313

1414
impl ParseTransformer for SkipExtraOperator {
1515
fn transform<'a>(&self, lr_parse_state: &LRParseState<'a>) -> Option<ParseTransform> {
16-
if !Self::allow_extra_operator(&lr_parse_state) {
16+
if !Self::allow_extra_operator(lr_parse_state) {
1717
return None;
1818
}
1919

crates/postgresql-cst-parser/src/tree_sitter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::{cst, syntax_kind::SyntaxKind, NodeOrToken, ParserError, ResolvedNode
1212

1313
impl Display for SyntaxKind {
1414
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
15-
write!(f, "{:?}", self)
15+
write!(f, "{self:?}")
1616
}
1717
}
1818

0 commit comments

Comments
 (0)