Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Rust 1.72 clippy lints #957

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Fix Rust 1.72 clippy lints #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263dc79
Fix new clippy lints
alamb Aug 25, 2023
ba32c3d
cargo clippy --fix`
alamb Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5881,7 +5881,7 @@ impl<'a> Parser<'a> {
Some(_) => {
let db_name = vec![self.parse_identifier()?];
let ObjectName(table_name) = object_name;
let object_name = db_name.into_iter().chain(table_name.into_iter()).collect();
let object_name = db_name.into_iter().chain(table_name).collect();
ObjectName(object_name)
}
None => object_name,
Expand Down
6 changes: 3 additions & 3 deletions tests/sqlparser_bigquery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fn parse_raw_literal() {
let sql = r#"SELECT R'abc', R"abc", R'f\(abc,(.*),def\)', R"f\(abc,(.*),def\)""#;
let stmt = bigquery().one_statement_parses_to(
sql,
r#"SELECT R'abc', R'abc', R'f\(abc,(.*),def\)', R'f\(abc,(.*),def\)'"#,
r"SELECT R'abc', R'abc', R'f\(abc,(.*),def\)', R'f\(abc,(.*),def\)'",
);
if let Statement::Query(query) = stmt {
if let SetExpr::Select(select) = *query.body {
Expand All @@ -69,11 +69,11 @@ fn parse_raw_literal() {
expr_from_projection(&select.projection[1])
);
assert_eq!(
&Expr::Value(Value::RawStringLiteral(r#"f\(abc,(.*),def\)"#.to_string())),
&Expr::Value(Value::RawStringLiteral(r"f\(abc,(.*),def\)".to_string())),
expr_from_projection(&select.projection[2])
);
assert_eq!(
&Expr::Value(Value::RawStringLiteral(r#"f\(abc,(.*),def\)"#.to_string())),
&Expr::Value(Value::RawStringLiteral(r"f\(abc,(.*),def\)".to_string())),
expr_from_projection(&select.projection[3])
);
return;
Expand Down
4 changes: 2 additions & 2 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7212,7 +7212,7 @@ fn parse_with_recursion_limit() {
.expect("tokenize to work")
.parse_statements();

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

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

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

#[test]
Expand Down
22 changes: 11 additions & 11 deletions tests/sqlparser_mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,11 +634,11 @@ fn parse_escaped_backticks_with_no_escape() {

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

let sql = r#"SELECT 'I\\'m not fine'"#;
let sql = r"SELECT 'I\\'m not fine'";
let result = std::panic::catch_unwind(|| mysql().one_statement_parses_to(sql, ""));
assert!(result.is_err());
}
Expand Down Expand Up @@ -666,7 +666,7 @@ fn parse_escaped_string_with_escape() {
_ => unreachable!(),
};
}
let sql = r#"SELECT 'I\'m fine'"#;
let sql = r"SELECT 'I\'m fine'";
assert_mysql_query_value(sql, "I'm fine");

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

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

Expand All @@ -702,17 +702,17 @@ fn parse_escaped_string_with_no_escape() {
_ => unreachable!(),
};
}
let sql = r#"SELECT 'I\'m fine'"#;
assert_mysql_query_value(sql, r#"I\'m fine"#);
let sql = r"SELECT 'I\'m fine'";
assert_mysql_query_value(sql, r"I\'m fine");

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

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

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

#[test]
Expand All @@ -723,7 +723,7 @@ fn check_roundtrip_of_escaped_string() {
dialects: vec![Box::new(MySqlDialect {})],
options: options.clone(),
}
.verified_stmt(r#"SELECT 'I\'m fine'"#);
.verified_stmt(r"SELECT 'I\'m fine'");
TestedDialects {
dialects: vec![Box::new(MySqlDialect {})],
options: options.clone(),
Expand All @@ -733,12 +733,12 @@ fn check_roundtrip_of_escaped_string() {
dialects: vec![Box::new(MySqlDialect {})],
options: options.clone(),
}
.verified_stmt(r#"SELECT 'I\\\'m fine'"#);
.verified_stmt(r"SELECT 'I\\\'m fine'");
TestedDialects {
dialects: vec![Box::new(MySqlDialect {})],
options: options.clone(),
}
.verified_stmt(r#"SELECT 'I\\\'m fine'"#);
.verified_stmt(r"SELECT 'I\\\'m fine'");

TestedDialects {
dialects: vec![Box::new(MySqlDialect {})],
Expand Down
7 changes: 3 additions & 4 deletions tests/sqlparser_postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2332,8 +2332,7 @@ fn pg_and_generic() -> TestedDialects {

#[test]
fn parse_escaped_literal_string() {
let sql =
r#"SELECT E's1 \n s1', E's2 \\n s2', E's3 \\\n s3', E's4 \\\\n s4', E'\'', E'foo \\'"#;
let sql = r"SELECT E's1 \n s1', E's2 \\n s2', E's3 \\\n s3', E's4 \\\\n s4', E'\'', E'foo \\'";
let select = pg_and_generic().verified_only_select(sql);
assert_eq!(6, select.projection.len());
assert_eq!(
Expand Down Expand Up @@ -2361,7 +2360,7 @@ fn parse_escaped_literal_string() {
expr_from_projection(&select.projection[5])
);

let sql = r#"SELECT E'\'"#;
let sql = r"SELECT E'\'";
assert_eq!(
pg_and_generic()
.parse_sql_statements(sql)
Expand Down Expand Up @@ -2631,7 +2630,7 @@ fn parse_create_role() {
err => panic!("Failed to parse CREATE ROLE test case: {err:?}"),
}

let negatables = vec![
let negatables = [
"BYPASSRLS",
"CREATEDB",
"CREATEROLE",
Expand Down
2 changes: 1 addition & 1 deletion tests/sqlparser_snowflake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ fn test_copy_into_copy_options() {

#[test]
fn test_snowflake_stage_object_names() {
let allowed_formatted_names = vec![
let allowed_formatted_names = [
"my_company.emp_basic",
"@namespace.%table_name",
"@namespace.%table_name/path",
Expand Down
Loading