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

Rust: apply formatting and linting

Browse Source
This commit is contained in:
Paolo Tranquilli
2025-03-21 11:00:10 +01:00
parent 8f8fe2f8b6
commit bd201afa8e
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/ast-generator/src/main.rs
View File

@@ -532,7 +532,11 @@ fn node_to_extractor_info(node: &AstNodeSrc) -> ExtractorNodeInfo {
fn write_extractor(grammar: &AstSrc) -> mustache::Result<String> { fn write_extractor(grammar: &AstSrc) -> mustache::Result<String> {
let extractor_info = ExtractorInfo { let extractor_info = ExtractorInfo {
enums: grammar.enums.iter().filter_map(enum_to_extractor_info).collect(), enums: grammar
.enums
.iter()
.filter_map(enum_to_extractor_info)
.collect(),
nodes: grammar.nodes.iter().map(node_to_extractor_info).collect(), nodes: grammar.nodes.iter().map(node_to_extractor_info).collect(),
}; };
let template = mustache::compile_str(include_str!("templates/extractor.mustache"))?; let template = mustache::compile_str(include_str!("templates/extractor.mustache"))?;

8
rust/extractor/src/crate_graph.rs
View File

@@ -64,7 +64,7 @@ pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootData
} }
// Extract each crate // Extract each crate
for krate_id in crate_graph.as_ref().iter() { for krate_id in crate_graph.as_ref().iter() {
if let Some((root_module_file, hash)) = crate_id_map.get(&krate_id) { if let Some((root_module_file, hash)) = crate_id_map.get(krate_id) {
let path = root_module_file.join(format!("{hash:0>16x}")); let path = root_module_file.join(format!("{hash:0>16x}"));
let mut trap = trap_provider.create("crates", path.as_path()); let mut trap = trap_provider.create("crates", path.as_path());
// If the trap file already exists, then skip extraction because we have already extracted // If the trap file already exists, then skip extraction because we have already extracted
@@ -427,7 +427,7 @@ fn emit_trait(
.iter() .iter()
.flat_map(|(name, item)| { .flat_map(|(name, item)| {
if let AssocItemId::FunctionId(function) = item { if let AssocItemId::FunctionId(function) = item {
let sig = db.callable_item_signature(function.clone().into()); let sig = db.callable_item_signature((*function).into());
let sig = sig.skip_binders(); let sig = sig.skip_binders();
let params = sig let params = sig
.params() .params()
@@ -540,7 +540,7 @@ fn emit_module_impls(
.iter() .iter()
.flat_map(|item| { .flat_map(|item| {
if let (name, AssocItemId::FunctionId(function)) = item { if let (name, AssocItemId::FunctionId(function)) = item {
let sig = db.callable_item_signature(function.clone().into()); let sig = db.callable_item_signature((*function).into());
let sig = sig.skip_binders(); let sig = sig.skip_binders();
let params = sig let params = sig
.params() .params()
@@ -572,7 +572,7 @@ fn emit_module_impls(
id: trap::TrapId::Star, id: trap::TrapId::Star,
text: Some(name.as_str().to_owned()), text: Some(name.as_str().to_owned()),
})); }));
let data = db.function_data(function.clone()); let data = db.function_data(*function);
let visibility = emit_visibility( let visibility = emit_visibility(
db, db,
trap, trap,

5
rust/extractor/src/rust_analyzer.rs
View File

@@ -73,7 +73,10 @@ impl<'a> RustAnalyzer<'a> {
if let Some(file_id) = path_to_file_id(path, vfs) { if let Some(file_id) = path_to_file_id(path, vfs) {
if let Ok(input) = std::panic::catch_unwind(|| semantics.db.file_text(file_id)) if let Ok(input) = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
{ {
let file_id = EditionedFileId::new(semantics.db, SpanEditionedFileId::current_edition(file_id)); let file_id = EditionedFileId::new(
semantics.db,
SpanEditionedFileId::current_edition(file_id),
);
let source_file = semantics.parse(file_id); let source_file = semantics.parse(file_id);
let errors = semantics let errors = semantics
.db .db