Skip to content

Commit 7ce6d14

Browse files
committed
lint
1 parent 66d8c64 commit 7ce6d14

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

crates/squawk_ide/src/code_actions.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ fn rewrite_table_as_select(
166166
file: &ast::SourceFile,
167167
offset: TextSize,
168168
) -> Option<()> {
169-
let token = token_from_offset(&file, offset)?;
169+
let token = token_from_offset(file, offset)?;
170170
let table = token.parent_ancestors().find_map(ast::Table::cast)?;
171171

172172
let relation_name = table.relation_name()?;
@@ -188,7 +188,7 @@ fn rewrite_select_as_table(
188188
file: &ast::SourceFile,
189189
offset: TextSize,
190190
) -> Option<()> {
191-
let token = token_from_offset(&file, offset)?;
191+
let token = token_from_offset(file, offset)?;
192192
let select = token.parent_ancestors().find_map(ast::Select::cast)?;
193193

194194
if !can_transform_select_to_table(&select) {
@@ -302,7 +302,7 @@ fn quote_identifier(
302302
file: &ast::SourceFile,
303303
offset: TextSize,
304304
) -> Option<()> {
305-
let token = token_from_offset(&file, offset)?;
305+
let token = token_from_offset(file, offset)?;
306306
let parent = token.parent()?;
307307

308308
let name_node = if let Some(name) = ast::Name::cast(parent.clone()) {
@@ -335,7 +335,7 @@ fn unquote_identifier(
335335
file: &ast::SourceFile,
336336
offset: TextSize,
337337
) -> Option<()> {
338-
let token = token_from_offset(&file, offset)?;
338+
let token = token_from_offset(file, offset)?;
339339
let parent = token.parent()?;
340340

341341
let name_node = if let Some(name) = ast::Name::cast(parent.clone()) {
@@ -393,10 +393,9 @@ fn unquote(node: &SyntaxNode) -> Option<String> {
393393
}
394394

395395
fn is_reserved_word(text: &str) -> bool {
396-
if let Ok(_) = RESERVED_KEYWORDS.binary_search(&text.to_lowercase().as_str()) {
397-
return true;
398-
}
399-
false
396+
RESERVED_KEYWORDS
397+
.binary_search(&text.to_lowercase().as_str())
398+
.is_ok()
400399
}
401400

402401
#[cfg(test)]

crates/xtask/src/codegen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ fn generate_kind_src(
217217
}
218218
}
219219

220-
fn generate_reserved_keywords_array(reserved_keywords: &Vec<String>) -> Result<String> {
220+
fn generate_reserved_keywords_array(reserved_keywords: &[String]) -> Result<String> {
221221
let mut reserved_keywords = reserved_keywords
222222
.iter()
223223
.map(|x| x.to_lowercase())

0 commit comments

Comments
 (0)