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<std::cmp::Ordering> {
-        Some(self.state_id.cmp(&other.state_id))
+        Some(self.cmp(other))
     }
 }
 
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" => {
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),