From 17f8eb9c5a7170aaee25b8dd92266a4d732ef2c5 Mon Sep 17 00:00:00 2001 From: joshwd36 Date: Thu, 7 Jan 2021 17:30:12 +0000 Subject: [PATCH] Fix clippy lints (#287) --- src/ast/ddl.rs | 2 +- src/ast/query.rs | 2 +- src/dialect/ansi.rs | 8 ++++---- src/dialect/generic.rs | 12 ++++++++---- src/dialect/mssql.rs | 12 ++++++++---- src/dialect/mysql.rs | 8 ++++---- src/dialect/postgresql.rs | 8 ++++---- src/dialect/snowflake.rs | 8 ++++---- src/dialect/sqlite.rs | 8 ++++---- 9 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs index 847ee71a..272bf7c2 100644 --- a/src/ast/ddl.rs +++ b/src/ast/ddl.rs @@ -254,7 +254,7 @@ impl fmt::Display for ColumnOption { } } -fn display_constraint_name<'a>(name: &'a Option) -> impl fmt::Display + 'a { +fn display_constraint_name(name: &'_ Option) -> impl fmt::Display + '_ { struct ConstraintName<'a>(&'a Option); impl<'a> fmt::Display for ConstraintName<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/src/ast/query.rs b/src/ast/query.rs index b28fa92a..1b8ccf7e 100644 --- a/src/ast/query.rs +++ b/src/ast/query.rs @@ -346,7 +346,7 @@ impl fmt::Display for Join { _ => "", } } - fn suffix<'a>(constraint: &'a JoinConstraint) -> impl fmt::Display + 'a { + fn suffix(constraint: &'_ JoinConstraint) -> impl fmt::Display + '_ { struct Suffix<'a>(&'a JoinConstraint); impl<'a> fmt::Display for Suffix<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/src/dialect/ansi.rs b/src/dialect/ansi.rs index ca01fb75..1015ca2d 100644 --- a/src/dialect/ansi.rs +++ b/src/dialect/ansi.rs @@ -17,13 +17,13 @@ pub struct AnsiDialect {} impl Dialect for AnsiDialect { fn is_identifier_start(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') + ('a'..='z').contains(&ch) || ('A'..='Z').contains(&ch) } fn is_identifier_part(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') - || (ch >= '0' && ch <= '9') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ('0'..='9').contains(&ch) || ch == '_' } } diff --git a/src/dialect/generic.rs b/src/dialect/generic.rs index 104d3a9a..818fa0d0 100644 --- a/src/dialect/generic.rs +++ b/src/dialect/generic.rs @@ -17,13 +17,17 @@ pub struct GenericDialect; impl Dialect for GenericDialect { fn is_identifier_start(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_' || ch == '#' || ch == '@' + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ch == '_' + || ch == '#' + || ch == '@' } fn is_identifier_part(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') - || (ch >= '0' && ch <= '9') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ('0'..='9').contains(&ch) || ch == '@' || ch == '$' || ch == '#' diff --git a/src/dialect/mssql.rs b/src/dialect/mssql.rs index c613a150..539a17a9 100644 --- a/src/dialect/mssql.rs +++ b/src/dialect/mssql.rs @@ -23,13 +23,17 @@ impl Dialect for MsSqlDialect { fn is_identifier_start(&self, ch: char) -> bool { // See https://docs.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-2017#rules-for-regular-identifiers // We don't support non-latin "letters" currently. - (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_' || ch == '#' || ch == '@' + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ch == '_' + || ch == '#' + || ch == '@' } fn is_identifier_part(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') - || (ch >= '0' && ch <= '9') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ('0'..='9').contains(&ch) || ch == '@' || ch == '$' || ch == '#' diff --git a/src/dialect/mysql.rs b/src/dialect/mysql.rs index a4aaafe6..6581195b 100644 --- a/src/dialect/mysql.rs +++ b/src/dialect/mysql.rs @@ -20,15 +20,15 @@ impl Dialect for MySqlDialect { // See https://dev.mysql.com/doc/refman/8.0/en/identifiers.html. // We don't yet support identifiers beginning with numbers, as that // makes it hard to distinguish numeric literals. - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) || ch == '_' || ch == '$' - || (ch >= '\u{0080}' && ch <= '\u{ffff}') + || ('\u{0080}'..='\u{ffff}').contains(&ch) } fn is_identifier_part(&self, ch: char) -> bool { - self.is_identifier_start(ch) || (ch >= '0' && ch <= '9') + self.is_identifier_start(ch) || ('0'..='9').contains(&ch) } fn is_delimited_identifier_start(&self, ch: char) -> bool { diff --git a/src/dialect/postgresql.rs b/src/dialect/postgresql.rs index 1c11d8a3..0c2eb99f 100644 --- a/src/dialect/postgresql.rs +++ b/src/dialect/postgresql.rs @@ -20,13 +20,13 @@ impl Dialect for PostgreSqlDialect { // See https://www.postgresql.org/docs/11/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS // We don't yet support identifiers beginning with "letters with // diacritical marks and non-Latin letters" - (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_' + ('a'..='z').contains(&ch) || ('A'..='Z').contains(&ch) || ch == '_' } fn is_identifier_part(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') - || (ch >= '0' && ch <= '9') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ('0'..='9').contains(&ch) || ch == '$' || ch == '_' } diff --git a/src/dialect/snowflake.rs b/src/dialect/snowflake.rs index 22fd55fa..93db9569 100644 --- a/src/dialect/snowflake.rs +++ b/src/dialect/snowflake.rs @@ -18,13 +18,13 @@ pub struct SnowflakeDialect; impl Dialect for SnowflakeDialect { // see https://docs.snowflake.com/en/sql-reference/identifiers-syntax.html fn is_identifier_start(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_' + ('a'..='z').contains(&ch) || ('A'..='Z').contains(&ch) || ch == '_' } fn is_identifier_part(&self, ch: char) -> bool { - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') - || (ch >= '0' && ch <= '9') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) + || ('0'..='9').contains(&ch) || ch == '$' || ch == '_' } diff --git a/src/dialect/sqlite.rs b/src/dialect/sqlite.rs index 16ec66ac..4ce2f834 100644 --- a/src/dialect/sqlite.rs +++ b/src/dialect/sqlite.rs @@ -25,14 +25,14 @@ impl Dialect for SQLiteDialect { fn is_identifier_start(&self, ch: char) -> bool { // See https://www.sqlite.org/draft/tokenreq.html - (ch >= 'a' && ch <= 'z') - || (ch >= 'A' && ch <= 'Z') + ('a'..='z').contains(&ch) + || ('A'..='Z').contains(&ch) || ch == '_' || ch == '$' - || (ch >= '\u{007f}' && ch <= '\u{ffff}') + || ('\u{007f}'..='\u{ffff}').contains(&ch) } fn is_identifier_part(&self, ch: char) -> bool { - self.is_identifier_start(ch) || (ch >= '0' && ch <= '9') + self.is_identifier_start(ch) || ('0'..='9').contains(&ch) } }