clippy

williballenthin · Mar 9, 2024 · cae2ae8 · cae2ae8
1 parent 305023e
commit cae2ae8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/bin/src/bin/jh.rs b/bin/src/bin/jh.rs
@@ -278,9 +278,7 @@ fn extract_workspace_features(ws: &dyn lancelot::workspace::Workspace) -> Result
                 return None;
             }
 
-            let Some(name) = ws.analysis().names.names_by_address.get(&va) else {
-                return None;
-            };
+            let name = ws.analysis().names.names_by_address.get(&va)?;
 
             let Ok(features) = extract_function_features(ws, va) else {
                 return None;

diff --git a/core/src/analysis/pe/mod.rs b/core/src/analysis/pe/mod.rs
@@ -246,10 +246,9 @@ pub fn find_functions(pe: &PE) -> Result<Vec<Function>> {
 pub fn find_function_starts(pe: &PE) -> Result<Vec<VA>> {
     Ok(find_functions(pe)?
         .into_iter()
-        .filter(|f| matches!(f, Function::Local(_)))
-        .map(|f| match f {
-            Function::Local(va) => va,
-            _ => unreachable!(),
+        .filter_map(|f| match f {
+            Function::Local(va) => Some(va),
+            _ => None,
         })
         .collect())
 }
diff --git a/core/src/analysis/pe/patterns.rs b/core/src/analysis/pe/patterns.rs
@@ -31,7 +31,7 @@ lazy_static! {
         // 0xC2 ......00 0x00
         // let RET_LONGFORM =
 
-        let PREPATTERN = format!("(?P<prepattern>{})", vec![
+        let PREPATTERN = format!("(?P<prepattern>{})", [
             CC,
             CCCC,
             NOP,
@@ -160,7 +160,7 @@ lazy_static! {
             \x48 \x83 \xEC .                     # sub  rsp, ??
         ";
 
-        let POSTPATTERN = format!("(?P<postpattern>{})", vec![
+        let POSTPATTERN = format!("(?P<postpattern>{})", [
             P0,
             P6,
             P18,

diff --git a/core/src/workspace/mod.rs b/core/src/workspace/mod.rs
@@ -62,11 +62,11 @@ impl NameIndex {
     }
 
     pub fn contains_address(&self, va: VA) -> bool {
-        return self.names_by_address.get(&va).is_some();
+        self.names_by_address.contains_key(&va)
     }
 
     pub fn contains_name(&self, name: &str) -> bool {
-        return self.addresses_by_name.get(name).is_some();
+        self.addresses_by_name.contains_key(name)
     }
 }
 

diff --git a/jslancelot/src/lib.rs b/jslancelot/src/lib.rs
@@ -332,10 +332,9 @@ impl PE {
         Ok(lancelot::analysis::pe::find_functions(&self.inner)
             .map_err(to_js_err)?
             .into_iter()
-            .filter(|f| matches!(f, lancelot::analysis::pe::Function::Local(_)))
-            .map(|f| match f {
-                lancelot::analysis::pe::Function::Local(va) => va,
-                _ => unreachable!(),
+            .filter_map(|f| match f {
+                lancelot::analysis::pe::Function::Local(va) => Some(va),
+                _ => None,
             })
             .collect())
     }

diff --git a/pyflirt/src/lib.rs b/pyflirt/src/lib.rs
@@ -3,7 +3,7 @@
 
 use anyhow::Error;
 use lancelot_flirt::{pat, sig};
-use pyo3::{self, prelude::*, types::*, wrap_pyfunction};
+use pyo3::{prelude::*, types::*, wrap_pyfunction};
 
 /// ValueError -> "you're doing something wrong"
 fn to_value_error(e: anyhow::Error) -> PyErr {

diff --git a/pylancelot/src/lib.rs b/pylancelot/src/lib.rs
@@ -15,7 +15,7 @@ use ::lancelot::{
     VA,
 };
 use anyhow::Error;
-use pyo3::{self, prelude::*, types::*, wrap_pyfunction};
+use pyo3::{prelude::*, types::*, wrap_pyfunction};
 
 /// ValueError -> "you're doing something wrong"
 fn to_value_error(e: anyhow::Error) -> PyErr {