Skip to content

Commit fb47497

Browse files
redsun82Copilot
redsun82
and
Copilot
committed
Fix tree-sitter clippy warnings
Rust 1.97 reports redundant formatting borrows and map iteration warnings under -D warnings. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9a40ad1 commit fb47497

7 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎shared/tree-sitter-extractor/src/autobuilder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl Autobuilder {
7676
cmd.arg(format!("--size-limit={limit}"));
7777
}
7878

79-
cmd.arg(format!("--language={}", &self.language));
79+
cmd.arg(format!("--language={}", self.language));
8080
cmd.arg("--working-dir=.");
8181
cmd.arg(&self.database);
8282

‎shared/tree-sitter-extractor/src/generator/dbscheme.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub enum DbColumnType {
5050

5151
impl fmt::Display for Case<'_> {
5252
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
53-
writeln!(f, "case @{}.{} of", &self.name, &self.column)?;
53+
writeln!(f, "case @{}.{} of", self.name, self.column)?;
5454
let mut sep = " ";
5555
for (c, tp) in &self.branches {
5656
writeln!(f, "{sep} {c} = @{tp}")?;

‎shared/tree-sitter-extractor/src/generator/mod.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ pub fn generate(
6565

6666
for language in languages {
6767
let prefix = node_types::to_snake_case(&language.name);
68-
let ast_node_name = format!("{}_ast_node", &prefix);
69-
let node_location_table_name = format!("{}_ast_node_location", &prefix);
70-
let node_parent_table_name = format!("{}_ast_node_parent", &prefix);
71-
let token_name = format!("{}_token", &prefix);
72-
let tokeninfo_name = format!("{}_tokeninfo", &prefix);
73-
let trivia_token_name = format!("{}_trivia_token", &prefix);
74-
let trivia_tokeninfo_name = format!("{}_trivia_tokeninfo", &prefix);
75-
let reserved_word_name = format!("{}_reserved_word", &prefix);
68+
let ast_node_name = format!("{}_ast_node", prefix);
69+
let node_location_table_name = format!("{}_ast_node_location", prefix);
70+
let node_parent_table_name = format!("{}_ast_node_parent", prefix);
71+
let token_name = format!("{}_token", prefix);
72+
let tokeninfo_name = format!("{}_tokeninfo", prefix);
73+
let trivia_token_name = format!("{}_trivia_token", prefix);
74+
let trivia_tokeninfo_name = format!("{}_trivia_tokeninfo", prefix);
75+
let reserved_word_name = format!("{}_reserved_word", prefix);
7676
// When a desugaring is configured, comments and other `extra` nodes are
7777
// preserved from the original parse tree as `TriviaToken`s.
7878
let has_trivia_tokens = language.desugar.is_some();
@@ -125,7 +125,7 @@ pub fn generate(
125125
let mut body = vec![];
126126

127127
let facade_import_name = if use_facade_ast {
128-
format!("FacadeAst::{}", &language.name)
128+
format!("FacadeAst::{}", language.name)
129129
} else {
130130
language.name.clone() // If not using a facade AST, treat the module itself as the facade module.
131131
};
@@ -389,8 +389,8 @@ fn convert_nodes(
389389
let mut entries = Vec::new();
390390
let mut ast_node_members: Set<&str> = Set::new();
391391
let token_kinds: Map<&str, usize> = nodes
392-
.iter()
393-
.filter_map(|(_, node)| match &node.kind {
392+
.values()
393+
.filter_map(|node| match &node.kind {
394394
node_types::EntryKind::Token { kind_id } => {
395395
Some((node.dbscheme_name.as_str(), *kind_id))
396396
}

‎shared/tree-sitter-extractor/src/generator/ql.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl fmt::Display for Import<'_> {
5050
if self.is_private {
5151
write!(f, "private ")?;
5252
}
53-
write!(f, "import {}", &self.module)?;
53+
write!(f, "import {}", self.module)?;
5454
if let Some(name) = &self.alias {
5555
write!(f, " as {name}")?;
5656
}
@@ -82,13 +82,13 @@ impl fmt::Display for Class<'_> {
8282
write!(f, "private ")?;
8383
}
8484
if let Some(alias) = &self.alias {
85-
write!(f, "class {} = {alias};", &self.name)?;
85+
write!(f, "class {} = {alias};", self.name)?;
8686
return Ok(());
8787
}
8888
if self.is_abstract {
8989
write!(f, "abstract ")?;
9090
}
91-
write!(f, "class {} extends ", &self.name)?;
91+
write!(f, "class {} extends ", self.name)?;
9292
for (index, supertype) in self.supertypes.iter().enumerate() {
9393
if index > 0 {
9494
write!(f, ", ")?;
@@ -365,7 +365,7 @@ impl fmt::Display for FormalParameter<'_> {
365365
/// Generates a QL library by writing the given `elements` to the `file`.
366366
pub fn write(file: &mut dyn std::io::Write, elements: &[TopLevel]) -> std::io::Result<()> {
367367
for element in elements {
368-
write!(file, "{}\n\n", &element)?;
368+
write!(file, "{}\n\n", element)?;
369369
}
370370
Ok(())
371371
}

‎shared/tree-sitter-extractor/src/node_types.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub fn convert_nodes(prefix: &str, nodes: &[NodeInfo]) -> NodeTypeMap {
130130
let flattened_name = &node_type_name(&node.kind, node.named);
131131
let dbscheme_name = escape_name(flattened_name);
132132
let ql_class_name = dbscheme_name_to_class_name(&dbscheme_name);
133-
let dbscheme_name = format!("{}_{}", prefix, &dbscheme_name);
133+
let dbscheme_name = format!("{}_{}", prefix, dbscheme_name);
134134
let subtypes = &node.subtypes;
135135
if !subtypes.is_empty() {
136136
// It's a tree-sitter supertype node, for which we create a union
@@ -156,8 +156,8 @@ pub fn convert_nodes(prefix: &str, nodes: &[NodeInfo]) -> NodeTypeMap {
156156
kind: node.kind.clone(),
157157
named: node.named,
158158
};
159-
let table_name = escape_name(&(format!("{}_def", &flattened_name)));
160-
let table_name = format!("{}_{}", prefix, &table_name);
159+
let table_name = escape_name(&(format!("{}_def", flattened_name)));
160+
let table_name = format!("{}_{}", prefix, table_name);
161161

162162
let mut fields = Vec::new();
163163

@@ -203,13 +203,13 @@ pub fn convert_nodes(prefix: &str, nodes: &[NodeInfo]) -> NodeTypeMap {
203203
counter += 1;
204204
let unprefixed_name = node_type_name(&type_name.kind, true);
205205
Entry {
206-
dbscheme_name: escape_name(&format!("{}_token_{}", &prefix, &unprefixed_name)),
206+
dbscheme_name: escape_name(&format!("{}_token_{}", prefix, unprefixed_name)),
207207
ql_class_name: dbscheme_name_to_class_name(&escape_name(&unprefixed_name)),
208208
kind: EntryKind::Token { kind_id: counter },
209209
}
210210
} else {
211211
Entry {
212-
dbscheme_name: format!("{}_reserved_word", &prefix),
212+
dbscheme_name: format!("{}_reserved_word", prefix),
213213
ql_class_name: "ReservedWord".to_owned(),
214214
kind: EntryKind::Token { kind_id: 0 },
215215
}
@@ -238,9 +238,9 @@ fn add_field(
238238
let has_index = field_info.multiple;
239239
let field_table_name = escape_name(&format!(
240240
"{}_{}_{}",
241-
&prefix,
241+
prefix,
242242
parent_flattened_name,
243-
&name_for_field_or_child(&field_name)
243+
name_for_field_or_child(&field_name)
244244
));
245245
Storage::Table {
246246
has_index,
@@ -261,7 +261,7 @@ fn add_field(
261261
let mut field_token_ints: BTreeMap<String, (usize, String)> = BTreeMap::new();
262262
for (counter, t) in converted_types.into_iter().enumerate() {
263263
let dbscheme_variant_name =
264-
escape_name(&format!("{}_{}_{}", &prefix, parent_flattened_name, t.kind));
264+
escape_name(&format!("{}_{}_{}", prefix, parent_flattened_name, t.kind));
265265
field_token_ints.insert(t.kind.to_owned(), (counter, dbscheme_variant_name));
266266
}
267267
FieldTypeInfo::ReservedWordInt(field_token_ints)
@@ -273,9 +273,9 @@ fn add_field(
273273
types: converted_types,
274274
dbscheme_union: format!(
275275
"{}_{}_{}_type",
276-
&prefix,
277-
&parent_flattened_name,
278-
&name_for_field_or_child(&field_name)
276+
prefix,
277+
parent_flattened_name,
278+
name_for_field_or_child(&field_name)
279279
),
280280
ql_class: "AstNode".to_owned(),
281281
}

‎shared/tree-sitter-extractor/src/options.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub fn num_threads() -> Result<usize, String> {
66
let threads_str = std::env::var("CODEQL_THREADS").unwrap_or_else(|_| "-1".into());
77
let num_cpus = num_cpus::get();
88
parse_codeql_threads(&threads_str, num_cpus)
9-
.ok_or_else(|| format!("Unable to parse CODEQL_THREADS value '{}'", &threads_str))
9+
.ok_or_else(|| format!("Unable to parse CODEQL_THREADS value '{}'", threads_str))
1010
}
1111

1212
/// Parses the given string to determine the number of threads the extractor

‎shared/tree-sitter-extractor/src/trap.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ impl Compression {
298298
match std::env::var(var_name) {
299299
Ok(method) => match Compression::from_string(&method) {
300300
Some(c) => Ok(c),
301-
None => Err(format!("Unknown compression method '{}'", &method)),
301+
None => Err(format!("Unknown compression method '{}'", method)),
302302
},
303303
// Default compression method if the env var isn't set:
304304
Err(_) => Ok(Compression::Gzip),

0 commit comments

Comments
 (0)