Skip to content

Commit d79222e

Browse files
committed
fix: lint
1 parent 8ae75b3 commit d79222e

File tree

5 files changed

+17
-30
lines changed

5 files changed

+17
-30
lines changed

crates/pgt_completions/benches/sanitization.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn sql_and_pos(sql: &str) -> (String, usize) {
1313
fn get_tree(sql: &str) -> tree_sitter::Tree {
1414
let mut parser = tree_sitter::Parser::new();
1515
parser.set_language(tree_sitter_sql::language()).unwrap();
16-
parser.parse(sql.to_string(), None).unwrap()
16+
parser.parse(sql, None).unwrap()
1717
}
1818

1919
fn to_params<'a>(
@@ -25,9 +25,9 @@ fn to_params<'a>(
2525
let pos: u32 = pos.try_into().unwrap();
2626
CompletionParams {
2727
position: TextSize::new(pos),
28-
schema: &cache,
28+
schema: cache,
2929
text,
30-
tree: tree,
30+
tree,
3131
}
3232
}
3333

crates/pgt_completions/src/providers/columns.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ mod tests {
204204
let has_column_in_first_four = |col: &'static str| {
205205
first_four
206206
.iter()
207-
.find(|compl_item| compl_item.label.as_str() == col)
208-
.is_some()
207+
.any(|compl_item| compl_item.label.as_str() == col)
209208
};
210209

211210
assert!(

crates/pgt_completions/src/providers/schemas.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub fn complete_schemas(ctx: &CompletionContext, builder: &mut CompletionBuilder
77
let available_schemas = &ctx.schema_cache.schemas;
88

99
for schema in available_schemas {
10-
let relevance = CompletionRelevanceData::Schema(&schema);
10+
let relevance = CompletionRelevanceData::Schema(schema);
1111

1212
let item = CompletionItem {
1313
label: schema.name.clone(),

crates/pgt_completions/src/sanitization.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub(crate) struct SanitizedCompletionParams<'a> {
1212
}
1313

1414
pub fn benchmark_sanitization(params: CompletionParams) -> String {
15-
let params: SanitizedCompletionParams = params.try_into().unwrap();
15+
let params: SanitizedCompletionParams = params.into();
1616
params.text
1717
}
1818

@@ -212,7 +212,7 @@ mod tests {
212212
.set_language(tree_sitter_sql::language())
213213
.expect("Error loading sql language");
214214

215-
let mut tree = parser.parse(input.to_string(), None).unwrap();
215+
let mut tree = parser.parse(input, None).unwrap();
216216

217217
// select | from users; <-- just right, one space after select token, one space before from
218218
assert!(cursor_inbetween_nodes(&mut tree, TextSize::new(7)));
@@ -236,7 +236,7 @@ mod tests {
236236
.set_language(tree_sitter_sql::language())
237237
.expect("Error loading sql language");
238238

239-
let mut tree = parser.parse(input.to_string(), None).unwrap();
239+
let mut tree = parser.parse(input, None).unwrap();
240240

241241
// select * from| <-- still on previous token
242242
assert!(!cursor_prepared_to_write_token_after_last_node(
@@ -274,7 +274,7 @@ mod tests {
274274
.set_language(tree_sitter_sql::language())
275275
.expect("Error loading sql language");
276276

277-
let mut tree = parser.parse(input.to_string(), None).unwrap();
277+
let mut tree = parser.parse(input, None).unwrap();
278278

279279
// select * from ;| <-- it's after the statement
280280
assert!(!cursor_before_semicolon(&mut tree, TextSize::new(19)));

crates/pgt_workspace/src/features/completions.rs

+8-20
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ impl IntoIterator for CompletionsResult {
2929
}
3030
}
3131

32-
pub(crate) fn get_statement_for_completions<'a>(
33-
doc: &'a ParsedDocument,
32+
pub(crate) fn get_statement_for_completions(
33+
doc: &ParsedDocument,
3434
position: TextSize,
3535
) -> Option<(StatementId, TextRange, String, Arc<tree_sitter::Tree>)> {
3636
let count = doc.count();
@@ -89,7 +89,7 @@ mod tests {
8989
(
9090
ParsedDocument::new(
9191
PgTPath::new("test.sql"),
92-
sql.replace(CURSOR_POSITION, "").into(),
92+
sql.replace(CURSOR_POSITION, ""),
9393
5,
9494
),
9595
TextSize::new(pos),
@@ -119,14 +119,11 @@ mod tests {
119119

120120
#[test]
121121
fn does_not_break_when_no_statements_exist() {
122-
let sql = format!("{}", CURSOR_POSITION);
122+
let sql = CURSOR_POSITION.to_string();
123123

124124
let (doc, position) = get_doc_and_pos(sql.as_str());
125125

126-
assert!(matches!(
127-
get_statement_for_completions(&doc, position),
128-
None
129-
));
126+
assert!(get_statement_for_completions(&doc, position).is_none());
130127
}
131128

132129
#[test]
@@ -138,10 +135,7 @@ mod tests {
138135
// make sure these are parsed as two
139136
assert_eq!(doc.count(), 2);
140137

141-
assert!(matches!(
142-
get_statement_for_completions(&doc, position),
143-
None
144-
));
138+
assert!(get_statement_for_completions(&doc, position).is_none());
145139
}
146140

147141
#[test]
@@ -174,10 +168,7 @@ mod tests {
174168

175169
let (doc, position) = get_doc_and_pos(sql.as_str());
176170

177-
assert!(matches!(
178-
get_statement_for_completions(&doc, position),
179-
None
180-
));
171+
assert!(get_statement_for_completions(&doc, position).is_none());
181172
}
182173

183174
#[test]
@@ -186,9 +177,6 @@ mod tests {
186177

187178
let (doc, position) = get_doc_and_pos(sql.as_str());
188179

189-
assert!(matches!(
190-
get_statement_for_completions(&doc, position),
191-
None
192-
));
180+
assert!(get_statement_for_completions(&doc, position).is_none());
193181
}
194182
}

0 commit comments

Comments
 (0)