Skip to content

Commit d8775e2

Browse files
authored
Fix linting errors (apache#318)
* Fix linting error * Fix linting errors
1 parent 56e50dc commit d8775e2

File tree

3 files changed

+16
-26
lines changed

3 files changed

+16
-26
lines changed

src/dialect/mod.rs

+5-14
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,11 @@ mod tests {
8585
dialect: ansi_dialect,
8686
};
8787

88-
assert_eq!(
89-
dialect_of!(generic_holder is GenericDialect | AnsiDialect),
90-
true
91-
);
92-
assert_eq!(dialect_of!(generic_holder is AnsiDialect), false);
88+
assert!(dialect_of!(generic_holder is GenericDialect | AnsiDialect),);
89+
assert!(!dialect_of!(generic_holder is AnsiDialect));
9390

94-
assert_eq!(dialect_of!(ansi_holder is AnsiDialect), true);
95-
assert_eq!(
96-
dialect_of!(ansi_holder is GenericDialect | AnsiDialect),
97-
true
98-
);
99-
assert_eq!(
100-
dialect_of!(ansi_holder is GenericDialect | MsSqlDialect),
101-
false
102-
);
91+
assert!(dialect_of!(ansi_holder is AnsiDialect));
92+
assert!(dialect_of!(ansi_holder is GenericDialect | AnsiDialect),);
93+
assert!(!dialect_of!(ansi_holder is GenericDialect | MsSqlDialect),);
10394
}
10495
}

src/parser.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2358,8 +2358,7 @@ impl<'a> Parser<'a> {
23582358
]) // This couldn't possibly be a bad idea
23592359
})?
23602360
.into_iter()
2361-
.filter(|i| i.is_some())
2362-
.map(|i| i.unwrap())
2361+
.flatten()
23632362
.collect();
23642363

23652364
lateral_views.push(LateralView {

tests/sqlparser_common.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ fn parse_top_level() {
249249
fn parse_simple_select() {
250250
let sql = "SELECT id, fname, lname FROM customer WHERE id = 1 LIMIT 5";
251251
let select = verified_only_select(sql);
252-
assert_eq!(false, select.distinct);
252+
assert!(!select.distinct);
253253
assert_eq!(3, select.projection.len());
254254
let select = verified_query(sql);
255255
assert_eq!(Some(Expr::Value(number("5"))), select.limit);
@@ -269,7 +269,7 @@ fn parse_limit_is_not_an_alias() {
269269
fn parse_select_distinct() {
270270
let sql = "SELECT DISTINCT name FROM customer";
271271
let select = verified_only_select(sql);
272-
assert_eq!(true, select.distinct);
272+
assert!(select.distinct);
273273
assert_eq!(
274274
&SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("name"))),
275275
only(&select.projection)
@@ -1693,8 +1693,8 @@ fn parse_alter_table_drop_column() {
16931693
} => {
16941694
assert_eq!("tab", name.to_string());
16951695
assert_eq!("is_active", column_name.to_string());
1696-
assert_eq!(true, if_exists);
1697-
assert_eq!(true, cascade);
1696+
assert!(if_exists);
1697+
assert!(cascade);
16981698
}
16991699
_ => unreachable!(),
17001700
}
@@ -2928,13 +2928,13 @@ fn parse_drop_table() {
29282928
cascade,
29292929
purge: _,
29302930
} => {
2931-
assert_eq!(false, if_exists);
2931+
assert!(!if_exists);
29322932
assert_eq!(ObjectType::Table, object_type);
29332933
assert_eq!(
29342934
vec!["foo"],
29352935
names.iter().map(ToString::to_string).collect::<Vec<_>>()
29362936
);
2937-
assert_eq!(false, cascade);
2937+
assert!(!cascade);
29382938
}
29392939
_ => unreachable!(),
29402940
}
@@ -2948,13 +2948,13 @@ fn parse_drop_table() {
29482948
cascade,
29492949
purge: _,
29502950
} => {
2951-
assert_eq!(true, if_exists);
2951+
assert!(if_exists);
29522952
assert_eq!(ObjectType::Table, object_type);
29532953
assert_eq!(
29542954
vec!["foo", "bar"],
29552955
names.iter().map(ToString::to_string).collect::<Vec<_>>()
29562956
);
2957-
assert_eq!(true, cascade);
2957+
assert!(cascade);
29582958
}
29592959
_ => unreachable!(),
29602960
}
@@ -3389,8 +3389,8 @@ fn parse_create_index() {
33893389
assert_eq!("idx_name", name.to_string());
33903390
assert_eq!("test", table_name.to_string());
33913391
assert_eq!(indexed_columns, columns);
3392-
assert_eq!(true, unique);
3393-
assert_eq!(true, if_not_exists)
3392+
assert!(unique);
3393+
assert!(if_not_exists)
33943394
}
33953395
_ => unreachable!(),
33963396
}

0 commit comments

Comments
 (0)