From d16dba7d07ff8c91ebac67fb34e0a6541bafe001 Mon Sep 17 00:00:00 2001 From: Taishi Naka Date: Tue, 28 Oct 2025 14:56:51 +0900 Subject: [PATCH 1/3] chore: Align lifetime syntax to satisfy `mismatched_lifetime_syntaxes` lint source: https://doc.rust-lang.org/beta/nightly-rustc/rustc_lint/lifetime_syntax/static.MISMATCHED_LIFETIME_SYNTAXES.html --- crates/postgresql-cst-parser/src/cst/lr_parse_state.rs | 2 +- crates/postgresql-cst-parser/src/tree_sitter.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/postgresql-cst-parser/src/cst/lr_parse_state.rs b/crates/postgresql-cst-parser/src/cst/lr_parse_state.rs index 6cf9269..818bf7c 100644 --- a/crates/postgresql-cst-parser/src/cst/lr_parse_state.rs +++ b/crates/postgresql-cst-parser/src/cst/lr_parse_state.rs @@ -16,7 +16,7 @@ impl<'a> LRParseState<'a> { matches!(self.extras.last(), Some(e) if e.end_byte_pos != self.token.start_byte_pos && e.kind == SyntaxKind::C_COMMENT) } - pub(crate) fn previous_extra(&self) -> Option<&Extra> { + pub(crate) fn previous_extra(&self) -> Option<&Extra<'_>> { let last_extra = self.extras.last()?; let stack_end_byte_pos = self diff --git a/crates/postgresql-cst-parser/src/tree_sitter.rs b/crates/postgresql-cst-parser/src/tree_sitter.rs index 85adab5..24f6a59 100644 --- a/crates/postgresql-cst-parser/src/tree_sitter.rs +++ b/crates/postgresql-cst-parser/src/tree_sitter.rs @@ -47,7 +47,7 @@ impl Tree { } } - pub fn root_node(&self) -> Node { + pub fn root_node(&self) -> Node<'_> { Node { input: &self.src, range_map: Rc::clone(&self.range_map), From 9cabc5994740db27d82b3980acd4d495ba6e8cd5 Mon Sep 17 00:00:00 2001 From: Taishi Naka Date: Tue, 28 Oct 2025 15:19:05 +0900 Subject: [PATCH 2/3] chore: resolve `non_canonical_partial_ord_impl` lint source: https://rust-lang.github.io/rust-clippy/master/index.html#non_canonical_partial_ord_impl --- crates/automata/src/nfa.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/automata/src/nfa.rs b/crates/automata/src/nfa.rs index 3598008..b1d00bd 100644 --- a/crates/automata/src/nfa.rs +++ b/crates/automata/src/nfa.rs @@ -39,7 +39,7 @@ impl PartialEq for NFAState<'_> { impl PartialOrd for NFAState<'_> { fn partial_cmp(&self, other: &Self) -> Option { - Some(self.state_id.cmp(&other.state_id)) + Some(self.cmp(other)) } } From bdaae16155f34f8b18f106d5bf4846f841d7ef17 Mon Sep 17 00:00:00 2001 From: Taishi Naka Date: Tue, 28 Oct 2025 16:16:13 +0900 Subject: [PATCH 3/3] chore: resolve `collapsible_if` lint by clippy source: https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if --- .../src/parser_generator/lexer/lexer_ported.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/parser-generator/src/parser_generator/lexer/lexer_ported.rs b/crates/parser-generator/src/parser_generator/lexer/lexer_ported.rs index 0d1ed6b..9dcc853 100644 --- a/crates/parser-generator/src/parser_generator/lexer/lexer_ported.rs +++ b/crates/parser-generator/src/parser_generator/lexer/lexer_ported.rs @@ -162,10 +162,10 @@ pub fn init_tokens(tokens: &mut [Token]) { for i in 0..tokens.len() - 1 { match &tokens[i].kind { TokenKind::KEYWORD(k) if k == "FORMAT" => { - if let Some(j) = next_token_index(tokens, i) { - if tokens[j].kind == TokenKind::KEYWORD("JSON".to_string()) { - tokens[i].kind = TokenKind::KEYWORD("FORMAT_LA".to_string()); - } + if let Some(j) = next_token_index(tokens, i) + && tokens[j].kind == TokenKind::KEYWORD("JSON".to_string()) + { + tokens[i].kind = TokenKind::KEYWORD("FORMAT_LA".to_string()); } } TokenKind::KEYWORD(k) if k == "NOT" => {