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

Apply clippy fixes

Browse Source
This commit is contained in:
Arthur Baars
2024-09-13 18:49:29 +02:00
parent 90537f9132
commit 7f8bb7e859
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rust/extractor/src/translate.rs
View File

@@ -75,15 +75,15 @@ impl CrateTranslator<'_> {
) where ) where
T: AstNode, T: AstNode,
{ {
source if let Some(data) = source
.file_id .file_id
.file_id() .file_id()
.map(|f| f.file_id()) .map(|f| f.file_id())
.and_then(|file_id| self.emit_file(file_id)) .and_then(|file_id| self.emit_file(file_id))
.map(|data| { {
let range = source.value.text_range(); let range = source.value.text_range();
self.emit_location_for_textrange(label, data, range) self.emit_location_for_textrange(label, data, range)
}); }
} }
fn emit_location_for_expr( fn emit_location_for_expr(
@@ -113,7 +113,7 @@ impl CrateTranslator<'_> {
pat: &ra_ap_hir_def::hir::LiteralOrConst, pat: &ra_ap_hir_def::hir::LiteralOrConst,
body: &Body, body: &Body,
source_map: &BodySourceMap, source_map: &BodySourceMap,
mut emit_location: impl FnMut(&mut CrateTranslator<'_>, trap::Label) -> (), mut emit_location: impl FnMut(&mut CrateTranslator<'_>, trap::Label),
) -> trap::Label { ) -> trap::Label {
match pat { match pat {
ra_ap_hir_def::hir::LiteralOrConst::Literal(_literal) => { ra_ap_hir_def::hir::LiteralOrConst::Literal(_literal) => {
@@ -147,14 +147,14 @@ impl CrateTranslator<'_> {
where where
T::Ast: AstNode, T::Ast: AstNode,
{ {
entity if let Some((data, source)) = entity
.source(self.db) .source(self.db)
.and_then(|source| source.file_id.file_id().map(|f| (f.file_id(), source))) .and_then(|source| source.file_id.file_id().map(|f| (f.file_id(), source)))
.and_then(|(file_id, source)| self.emit_file(file_id).map(|data| (data, source))) .and_then(|(file_id, source)| self.emit_file(file_id).map(|data| (data, source)))
.map(|(data, source)| { {
let range = source.value.syntax().text_range(); let range = source.value.syntax().text_range();
self.emit_location_for_textrange(label, data, range); self.emit_location_for_textrange(label, data, range);
}); }
} }
fn emit_location_for_textrange( fn emit_location_for_textrange(
&mut self, &mut self,
@@ -260,7 +260,9 @@ impl CrateTranslator<'_> {
ellipsis, ellipsis,
} => { } => {
let path = path.as_ref().map(|path| self.emit_path(path)); let path = path.as_ref().map(|path| self.emit_path(path));
path.map(|p| self.emit_location_for_pat(p, pat_id, source_map)); if let Some(p) = path {
self.emit_location_for_pat(p, pat_id, source_map)
}
let flds = args let flds = args
.into_iter() .into_iter()
.map(|arg| self.emit_record_field_pat(arg, body, source_map)) .map(|arg| self.emit_record_field_pat(arg, body, source_map))
@@ -340,7 +342,9 @@ impl CrateTranslator<'_> {
ellipsis, ellipsis,
} => { } => {
let path = path.as_ref().map(|path| self.emit_path(path)); let path = path.as_ref().map(|path| self.emit_path(path));
path.map(|p| self.emit_location_for_pat(p, pat_id, source_map)); if let Some(p) = path {
self.emit_location_for_pat(p, pat_id, source_map)
}
let args = args let args = args
.into_iter() .into_iter()
@@ -666,7 +670,9 @@ impl CrateTranslator<'_> {
is_assignee_expr, is_assignee_expr,
} => { } => {
let path = path.as_ref().map(|path| self.emit_path(path)); let path = path.as_ref().map(|path| self.emit_path(path));
path.map(|p| self.emit_location_for_expr(p, expr_id, source_map)); if let Some(p) = path {
self.emit_location_for_expr(p, expr_id, source_map)
}
let flds = fields let flds = fields
.into_iter() .into_iter()