From 1283a93e8070b185bfeef76c2998ff035d06e807 Mon Sep 17 00:00:00 2001 From: Joshua Wong Date: Wed, 6 Nov 2024 17:48:13 -0500 Subject: [PATCH] fix clippy lints --- crates/forge_analyzer/src/checkers.rs | 8 ++++---- crates/forge_analyzer/src/definitions.rs | 9 ++++----- crates/forge_analyzer/src/ir.rs | 4 +++- crates/forge_analyzer/src/utils.rs | 4 ++-- .../src/permissions_resolver.rs | 1 - crates/fsrt/src/forge_project.rs | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/crates/forge_analyzer/src/checkers.rs b/crates/forge_analyzer/src/checkers.rs index 99dbac37..d5a67aa6 100644 --- a/crates/forge_analyzer/src/checkers.rs +++ b/crates/forge_analyzer/src/checkers.rs @@ -502,7 +502,7 @@ impl<'cx> Runner<'cx> for AuthZChecker { } } -impl<'cx> Checker<'cx> for AuthZChecker { +impl Checker<'_> for AuthZChecker { type Vuln = AuthZVuln; } @@ -664,7 +664,7 @@ impl<'cx> Runner<'cx> for AuthenticateChecker { } } -impl<'cx> Checker<'cx> for AuthenticateChecker { +impl Checker<'_> for AuthenticateChecker { type Vuln = AuthNVuln; } @@ -980,7 +980,7 @@ impl<'cx> Runner<'cx> for SecretChecker { } } -impl<'cx> Checker<'cx> for SecretChecker { +impl Checker<'_> for SecretChecker { type Vuln = SecretVuln; } @@ -1299,7 +1299,7 @@ impl<'cx> Runner<'cx> for PermissionChecker { } } -impl<'cx> Checker<'cx> for PermissionChecker { +impl Checker<'_> for PermissionChecker { type Vuln = PermissionVuln; } diff --git a/crates/forge_analyzer/src/definitions.rs b/crates/forge_analyzer/src/definitions.rs index 2cda2f0c..dde24b82 100644 --- a/crates/forge_analyzer/src/definitions.rs +++ b/crates/forge_analyzer/src/definitions.rs @@ -663,7 +663,7 @@ fn normalize_callee_expr( in_prop: bool, } - impl<'cx> CalleeNormalizer<'cx> { + impl CalleeNormalizer<'_> { fn check_prop(&mut self, n: &MemberProp) { let old_prop = mem::replace(&mut self.in_prop, true); n.visit_with(self); @@ -972,7 +972,7 @@ fn classify_api_call(expr: &Expr) -> ApiCallKind { classifier.kind } -impl<'cx> FunctionAnalyzer<'cx> { +impl FunctionAnalyzer<'_> { #[inline] fn set_curr_terminator(&mut self, term: Terminator) { self.body.set_terminator(self.block, term); @@ -1031,15 +1031,14 @@ impl<'cx> FunctionAnalyzer<'cx> { [PropPath::Def(def), PropPath::Static(ref s), ..] if is_storage_read(s) => { match self.res.is_imported_from(def, "@forge/api") { - Some(&ImportKind::Named(ref name)) if *name == *"storage" => { + Some(ImportKind::Named(name)) if *name == *"storage" => { Some(Intrinsic::StorageRead) } _ => None, } } [PropPath::Def(def), ..] if self.res.is_imported_from(def, "@forge/api").is_some() => { - if let Some(&ImportKind::Named(ref name)) = - self.res.is_imported_from(def, "@forge/api") + if let Some(ImportKind::Named(name)) = self.res.is_imported_from(def, "@forge/api") { if *name == *"authorize" { return Some(Intrinsic::Authorize(IntrinsicName::Other)); diff --git a/crates/forge_analyzer/src/ir.rs b/crates/forge_analyzer/src/ir.rs index 580ad7a8..458a4740 100644 --- a/crates/forge_analyzer/src/ir.rs +++ b/crates/forge_analyzer/src/ir.rs @@ -362,7 +362,9 @@ impl Body { } #[inline] - pub(crate) fn iter_cfg_enumerated(&self) -> impl IntoIterator + 'static + use<> { + pub(crate) fn iter_cfg_enumerated( + &self, + ) -> impl IntoIterator + 'static + use<> { self.build_cfg_vec() } diff --git a/crates/forge_analyzer/src/utils.rs b/crates/forge_analyzer/src/utils.rs index 03c65d04..310b3c49 100644 --- a/crates/forge_analyzer/src/utils.rs +++ b/crates/forge_analyzer/src/utils.rs @@ -134,12 +134,12 @@ pub fn return_combinations_phi(exprs: Vec) -> Value { combinations = new_combinations; } - return Value::Phi( + Value::Phi( combinations .iter() .map(|value| Const::Literal(value.clone())) .collect_vec(), - ); + ) } pub fn eq_prop_name(n: &MemberProp, name: &str) -> bool { diff --git a/crates/forge_permission_resolver/src/permissions_resolver.rs b/crates/forge_permission_resolver/src/permissions_resolver.rs index ddef9964..b83de7c9 100644 --- a/crates/forge_permission_resolver/src/permissions_resolver.rs +++ b/crates/forge_permission_resolver/src/permissions_resolver.rs @@ -109,7 +109,6 @@ pub fn get_permisions_for( endpoint_map_classic: &mut PermissionHashMap, endpoint_regex: &mut HashMap, ) { - #[allow(if_let_rescope)] if let Result::Ok(response) = ureq::get(url).call() { let data: SwaggerReponse = response.into_json().unwrap(); for (key, endpoint_data) in &data.paths { diff --git a/crates/fsrt/src/forge_project.rs b/crates/fsrt/src/forge_project.rs index 7d1606a5..f0741623 100644 --- a/crates/fsrt/src/forge_project.rs +++ b/crates/fsrt/src/forge_project.rs @@ -107,7 +107,7 @@ pub(crate) struct ForgeProjectFromDir { pub manifest_file_content: String, } -impl<'a> ForgeProjectTrait<'a> for ForgeProjectFromDir { +impl ForgeProjectTrait<'_> for ForgeProjectFromDir { fn load_file(&self, path: impl AsRef, sourcemap: Arc) -> Arc { sourcemap.load_file(path.as_ref()).unwrap() }