Skip to content

Commit 13f73d1

Browse files
fix clippy
1 parent 421381c commit 13f73d1

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

src/parser/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11033,14 +11033,14 @@ impl<'a> Parser<'a> {
1103311033

1103411034
if self.dialect.supports_comma_separated_set_assignments() {
1103511035
if let Ok(v) = self
11036-
.try_parse(|parser| Ok(parser.parse_comma_separated(Parser::parse_set_assignment)?))
11036+
.try_parse(|parser| parser.parse_comma_separated(Parser::parse_set_assignment))
1103711037
{
1103811038
let (variables, values): (Vec<_>, Vec<_>) = v.into_iter().unzip();
1103911039

1104011040
let variables = if variables.len() == 1 {
1104111041
variables.into_iter().next().unwrap()
1104211042
} else {
11043-
OneOrManyWithParens::Many(variables.into_iter().flatten().map(|v| v).collect())
11043+
OneOrManyWithParens::Many(variables.into_iter().flatten().collect())
1104411044
};
1104511045

1104611046
return Ok(Statement::SetVariable {
@@ -11097,27 +11097,27 @@ impl<'a> Parser<'a> {
1109711097
None
1109811098
};
1109911099

11100-
return Ok(Statement::SetNames {
11100+
Ok(Statement::SetNames {
1110111101
charset_name,
1110211102
collation_name,
11103-
});
11103+
})
1110411104
}
1110511105
"TIMEZONE" => match self.parse_expr() {
1110611106
Ok(expr) => {
11107-
return Ok(Statement::SetTimeZone {
11107+
Ok(Statement::SetTimeZone {
1110811108
local: modifier == Some(Keyword::LOCAL),
1110911109
value: expr,
1111011110
})
1111111111
}
11112-
_ => return self.expected("timezone value", self.peek_token()),
11112+
_ => self.expected("timezone value", self.peek_token()),
1111311113
},
1111411114
"CHARACTERISTICS" => {
1111511115
self.expect_keywords(&[Keyword::AS, Keyword::TRANSACTION])?;
11116-
return Ok(Statement::SetTransaction {
11116+
Ok(Statement::SetTransaction {
1111711117
modes: self.parse_transaction_modes()?,
1111811118
snapshot: None,
1111911119
session: true,
11120-
});
11120+
})
1112111121
}
1112211122
"TRANSACTION" if modifier.is_none() => {
1112311123
if self.parse_keyword(Keyword::SNAPSHOT) {
@@ -11128,17 +11128,17 @@ impl<'a> Parser<'a> {
1112811128
session: false,
1112911129
});
1113011130
}
11131-
return Ok(Statement::SetTransaction {
11131+
Ok(Statement::SetTransaction {
1113211132
modes: self.parse_transaction_modes()?,
1113311133
snapshot: None,
1113411134
session: false,
11135-
});
11135+
})
1113611136
}
1113711137
_ if self.dialect.supports_set_stmt_without_operator() => {
1113811138
self.prev_token();
11139-
return self.parse_set_session_params();
11139+
self.parse_set_session_params()
1114011140
}
11141-
_ => return self.expected("equals sign or TO", self.peek_token()),
11141+
_ => self.expected("equals sign or TO", self.peek_token()),
1114211142
}
1114311143
}
1114411144

tests/sqlparser_common.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14648,15 +14648,14 @@ fn parse_multiple_set_statements() -> Result<(), ParserError> {
1464814648

1464914649
let stmt = stmt[0].clone();
1465014650

14651-
assert!(matches!(stmt, Statement::SetVariable { .. }));
1465214651
match stmt {
1465314652
Statement::SetVariable {
1465414653
variables, value, ..
1465514654
} => {
1465614655
assert_eq!(value.len(), 2);
1465714656
assert_eq!(variables.len(), 2);
1465814657
}
14659-
_ => assert!(false, "Expected SetVariable with 2 variables and 2 values"),
14658+
_ => panic!("Expected SetVariable with 2 variables and 2 values"),
1466014659
};
1466114660

1466214661
Ok(())

0 commit comments

Comments
 (0)