Skip to content

Commit 14da37d

Browse files
alambalamb
authored
Fix Rust 1.72 clippy lints (apache#957)
1 parent 4a2fa66 commit 14da37d

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎src/parser/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5881,7 +5881,7 @@ impl<'a> Parser<'a> {
58815881
Some(_) => {
58825882
let db_name = vec![self.parse_identifier()?];
58835883
let ObjectName(table_name) = object_name;
5884-
let object_name = db_name.into_iter().chain(table_name.into_iter()).collect();
5884+
let object_name = db_name.into_iter().chain(table_name).collect();
58855885
ObjectName(object_name)
58865886
}
58875887
None => object_name,

‎tests/sqlparser_bigquery.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn parse_raw_literal() {
5555
let sql = r#"SELECT R'abc', R"abc", R'f\(abc,(.*),def\)', R"f\(abc,(.*),def\)""#;
5656
let stmt = bigquery().one_statement_parses_to(
5757
sql,
58-
r#"SELECT R'abc', R'abc', R'f\(abc,(.*),def\)', R'f\(abc,(.*),def\)'"#,
58+
r"SELECT R'abc', R'abc', R'f\(abc,(.*),def\)', R'f\(abc,(.*),def\)'",
5959
);
6060
if let Statement::Query(query) = stmt {
6161
if let SetExpr::Select(select) = *query.body {
@@ -69,11 +69,11 @@ fn parse_raw_literal() {
6969
expr_from_projection(&select.projection[1])
7070
);
7171
assert_eq!(
72-
&Expr::Value(Value::RawStringLiteral(r#"f\(abc,(.*),def\)"#.to_string())),
72+
&Expr::Value(Value::RawStringLiteral(r"f\(abc,(.*),def\)".to_string())),
7373
expr_from_projection(&select.projection[2])
7474
);
7575
assert_eq!(
76-
&Expr::Value(Value::RawStringLiteral(r#"f\(abc,(.*),def\)"#.to_string())),
76+
&Expr::Value(Value::RawStringLiteral(r"f\(abc,(.*),def\)".to_string())),
7777
expr_from_projection(&select.projection[3])
7878
);
7979
return;

‎tests/sqlparser_common.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7212,7 +7212,7 @@ fn parse_with_recursion_limit() {
72127212
.expect("tokenize to work")
72137213
.parse_statements();
72147214

7215-
assert!(matches!(res, Ok(_)), "{res:?}");
7215+
assert!(res.is_ok(), "{res:?}");
72167216

72177217
// limit recursion to something smaller, expect parsing to fail
72187218
let res = Parser::new(&dialect)
@@ -7230,7 +7230,7 @@ fn parse_with_recursion_limit() {
72307230
.with_recursion_limit(50)
72317231
.parse_statements();
72327232

7233-
assert!(matches!(res, Ok(_)), "{res:?}");
7233+
assert!(res.is_ok(), "{res:?}");
72347234
}
72357235

72367236
#[test]

‎tests/sqlparser_mysql.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -634,11 +634,11 @@ fn parse_escaped_backticks_with_no_escape() {
634634

635635
#[test]
636636
fn parse_unterminated_escape() {
637-
let sql = r#"SELECT 'I\'m not fine\'"#;
637+
let sql = r"SELECT 'I\'m not fine\'";
638638
let result = std::panic::catch_unwind(|| mysql().one_statement_parses_to(sql, ""));
639639
assert!(result.is_err());
640640

641-
let sql = r#"SELECT 'I\\'m not fine'"#;
641+
let sql = r"SELECT 'I\\'m not fine'";
642642
let result = std::panic::catch_unwind(|| mysql().one_statement_parses_to(sql, ""));
643643
assert!(result.is_err());
644644
}
@@ -666,7 +666,7 @@ fn parse_escaped_string_with_escape() {
666666
_ => unreachable!(),
667667
};
668668
}
669-
let sql = r#"SELECT 'I\'m fine'"#;
669+
let sql = r"SELECT 'I\'m fine'";
670670
assert_mysql_query_value(sql, "I'm fine");
671671

672672
let sql = r#"SELECT 'I''m fine'"#;
@@ -675,7 +675,7 @@ fn parse_escaped_string_with_escape() {
675675
let sql = r#"SELECT 'I\"m fine'"#;
676676
assert_mysql_query_value(sql, "I\"m fine");
677677

678-
let sql = r#"SELECT 'Testing: \0 \\ \% \_ \b \n \r \t \Z \a \ '"#;
678+
let sql = r"SELECT 'Testing: \0 \\ \% \_ \b \n \r \t \Z \a \ '";
679679
assert_mysql_query_value(sql, "Testing: \0 \\ % _ \u{8} \n \r \t \u{1a} a ");
680680
}
681681

@@ -702,17 +702,17 @@ fn parse_escaped_string_with_no_escape() {
702702
_ => unreachable!(),
703703
};
704704
}
705-
let sql = r#"SELECT 'I\'m fine'"#;
706-
assert_mysql_query_value(sql, r#"I\'m fine"#);
705+
let sql = r"SELECT 'I\'m fine'";
706+
assert_mysql_query_value(sql, r"I\'m fine");
707707

708708
let sql = r#"SELECT 'I''m fine'"#;
709709
assert_mysql_query_value(sql, r#"I''m fine"#);
710710

711711
let sql = r#"SELECT 'I\"m fine'"#;
712712
assert_mysql_query_value(sql, r#"I\"m fine"#);
713713

714-
let sql = r#"SELECT 'Testing: \0 \\ \% \_ \b \n \r \t \Z \a \ '"#;
715-
assert_mysql_query_value(sql, r#"Testing: \0 \\ \% \_ \b \n \r \t \Z \a \ "#);
714+
let sql = r"SELECT 'Testing: \0 \\ \% \_ \b \n \r \t \Z \a \ '";
715+
assert_mysql_query_value(sql, r"Testing: \0 \\ \% \_ \b \n \r \t \Z \a \ ");
716716
}
717717

718718
#[test]
@@ -723,7 +723,7 @@ fn check_roundtrip_of_escaped_string() {
723723
dialects: vec![Box::new(MySqlDialect {})],
724724
options: options.clone(),
725725
}
726-
.verified_stmt(r#"SELECT 'I\'m fine'"#);
726+
.verified_stmt(r"SELECT 'I\'m fine'");
727727
TestedDialects {
728728
dialects: vec![Box::new(MySqlDialect {})],
729729
options: options.clone(),
@@ -733,12 +733,12 @@ fn check_roundtrip_of_escaped_string() {
733733
dialects: vec![Box::new(MySqlDialect {})],
734734
options: options.clone(),
735735
}
736-
.verified_stmt(r#"SELECT 'I\\\'m fine'"#);
736+
.verified_stmt(r"SELECT 'I\\\'m fine'");
737737
TestedDialects {
738738
dialects: vec![Box::new(MySqlDialect {})],
739739
options: options.clone(),
740740
}
741-
.verified_stmt(r#"SELECT 'I\\\'m fine'"#);
741+
.verified_stmt(r"SELECT 'I\\\'m fine'");
742742

743743
TestedDialects {
744744
dialects: vec![Box::new(MySqlDialect {})],

‎tests/sqlparser_postgres.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,8 +2332,7 @@ fn pg_and_generic() -> TestedDialects {
23322332

23332333
#[test]
23342334
fn parse_escaped_literal_string() {
2335-
let sql =
2336-
r#"SELECT E's1 \n s1', E's2 \\n s2', E's3 \\\n s3', E's4 \\\\n s4', E'\'', E'foo \\'"#;
2335+
let sql = r"SELECT E's1 \n s1', E's2 \\n s2', E's3 \\\n s3', E's4 \\\\n s4', E'\'', E'foo \\'";
23372336
let select = pg_and_generic().verified_only_select(sql);
23382337
assert_eq!(6, select.projection.len());
23392338
assert_eq!(
@@ -2361,7 +2360,7 @@ fn parse_escaped_literal_string() {
23612360
expr_from_projection(&select.projection[5])
23622361
);
23632362

2364-
let sql = r#"SELECT E'\'"#;
2363+
let sql = r"SELECT E'\'";
23652364
assert_eq!(
23662365
pg_and_generic()
23672366
.parse_sql_statements(sql)
@@ -2631,7 +2630,7 @@ fn parse_create_role() {
26312630
err => panic!("Failed to parse CREATE ROLE test case: {err:?}"),
26322631
}
26332632

2634-
let negatables = vec![
2633+
let negatables = [
26352634
"BYPASSRLS",
26362635
"CREATEDB",
26372636
"CREATEROLE",

‎tests/sqlparser_snowflake.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ fn test_copy_into_copy_options() {
10041004

10051005
#[test]
10061006
fn test_snowflake_stage_object_names() {
1007-
let allowed_formatted_names = vec![
1007+
let allowed_formatted_names = [
10081008
"my_company.emp_basic",
10091009
"@namespace.%table_name",
10101010
"@namespace.%table_name/path",

0 commit comments

Comments
 (0)