hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tree-sitter-xtractor: fix clippy warnings

Browse Source
This commit is contained in:
Arthur Baars
2023-05-14 19:52:27 +02:00
parent 5e279f2898
commit 2416568489
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shared/tree-sitter-extractor/src/autobuilder.rs
View File

@@ -15,7 +15,7 @@ impl Autobuilder {
pub fn new(language: &str, database: PathBuf) -> Self { pub fn new(language: &str, database: PathBuf) -> Self {
Self { Self {
language: language.to_string(), language: language.to_string(),
database: database, database,
include_extensions: vec![], include_extensions: vec![],
include_globs: vec![], include_globs: vec![],
exclude_globs: vec![], exclude_globs: vec![],
@@ -24,17 +24,17 @@ impl Autobuilder {
} }
pub fn include_extensions(&mut self, exts: &[&str]) -> &mut Self { pub fn include_extensions(&mut self, exts: &[&str]) -> &mut Self {
self.include_extensions = exts.into_iter().map(|s| String::from(*s)).collect(); self.include_extensions = exts.iter().map(|s| String::from(*s)).collect();
self self
} }
pub fn include_globs(&mut self, globs: &[&str]) -> &mut Self { pub fn include_globs(&mut self, globs: &[&str]) -> &mut Self {
self.include_globs = globs.into_iter().map(|s| String::from(*s)).collect(); self.include_globs = globs.iter().map(|s| String::from(*s)).collect();
self self
} }
pub fn exclude_globs(&mut self, globs: &[&str]) -> &mut Self { pub fn exclude_globs(&mut self, globs: &[&str]) -> &mut Self {
self.exclude_globs = globs.into_iter().map(|s| String::from(*s)).collect(); self.exclude_globs = globs.iter().map(|s| String::from(*s)).collect();
self self
} }

12
shared/tree-sitter-extractor/src/generator/mod.rs
View File

@@ -23,22 +23,22 @@ pub fn generate(
e e
})?; })?;
let mut dbscheme_writer = LineWriter::new(dbscheme_file); let mut dbscheme_writer = LineWriter::new(dbscheme_file);
write!( writeln!(
dbscheme_writer, dbscheme_writer,
"// CodeQL database schema for {}\n\ "// CodeQL database schema for {}\n\
// Automatically generated from the tree-sitter grammar; do not edit\n\n", // Automatically generated from the tree-sitter grammar; do not edit\n",
languages[0].name languages[0].name
)?; )?;
write!(dbscheme_writer, include_str!("prefix.dbscheme"))?; writeln!(dbscheme_writer, include_str!("prefix.dbscheme"))?;
let mut ql_writer = LineWriter::new(File::create(ql_library_path)?); let mut ql_writer = LineWriter::new(File::create(ql_library_path)?);
write!( writeln!(
ql_writer, ql_writer,
"/**\n\ "/**\n\
* CodeQL library for {} * CodeQL library for {}
* Automatically generated from the tree-sitter grammar; do not edit\n\ * Automatically generated from the tree-sitter grammar; do not edit\n\
*/\n\n", */\n",
languages[0].name languages[0].name
)?; )?;
ql::write( ql::write(
@@ -60,7 +60,7 @@ pub fn generate(
let nodes = node_types::read_node_types_str(&prefix, language.node_types)?; let nodes = node_types::read_node_types_str(&prefix, language.node_types)?;
let (dbscheme_entries, mut ast_node_members, token_kinds) = convert_nodes(&nodes); let (dbscheme_entries, mut ast_node_members, token_kinds) = convert_nodes(&nodes);
ast_node_members.insert(&token_name); ast_node_members.insert(&token_name);
write!(&mut dbscheme_writer, "/*- {} dbscheme -*/\n", language.name)?; writeln!(&mut dbscheme_writer, "/*- {} dbscheme -*/", language.name)?;
dbscheme::write(&mut dbscheme_writer, &dbscheme_entries)?; dbscheme::write(&mut dbscheme_writer, &dbscheme_entries)?;
let token_case = create_token_case(&token_name, token_kinds); let token_case = create_token_case(&token_name, token_kinds);
dbscheme::write( dbscheme::write(

1
shared/tree-sitter-extractor/src/generator/prefix.dbscheme
View File

@@ -98,4 +98,3 @@ yaml_locations(unique int locatable: @yaml_locatable ref,
int location: @location_default ref); int location: @location_default ref);
@yaml_locatable = @yaml_node | @yaml_error; @yaml_locatable = @yaml_node | @yaml_error;