[WARP] Misc cleanup

Author: emesare

plugins/warp/src/cache/function.rs

@@ -11,7 +11,7 @@ use warp::signature::function::Function;
 /// IMPORTANT: This will mark the function as needing updates, if you intend to fill in functions with
 /// no match (i.e. `None`), then you must change this function to prevent marking that as needing updates.
 /// However, it's perfectly valid to remove a match and need to update the function still, so be careful.
-pub fn insert_cached_function_match(function: &BNFunction, matched_function: Option<Function>) {
+pub fn insert_cached_function_match(function: &BNFunction, matched_function: Option<&Function>) {
     let view = function.view();
     let function_start = function.start();
     // NOTE: If we expect to run match_function multiple times on a function, we should move this elsewhere.

plugins/warp/src/cache/guid.rs

@@ -49,7 +49,7 @@ where
     // TODO: Implied constraints, symbol name, image offset
     let cs_constraints = cached_call_site_constraints(function);
     let adj_constraints = cached_adjacency_constraints(function, filter);
-    cs_constraints.union(&adj_constraints).cloned().collect()
+    cs_constraints.union(&adj_constraints).copied().collect()
 }
 
 pub fn cached_call_site_constraints(function: &BNFunction) -> HashSet<Constraint> {

plugins/warp/src/plugin/ffi/function.rs

@@ -68,10 +68,7 @@ pub unsafe extern "C" fn BNWARPFunctionApply(
         false => {
             // Set the matched function to `function`.
             let matched_function = ManuallyDrop::new(Arc::from_raw(function));
-            insert_cached_function_match(
-                &analysis_function,
-                Some(matched_function.as_ref().clone()),
-            )
+            insert_cached_function_match(&analysis_function, Some(&matched_function))
         }
         true => {
             // We are removing the previous match.

plugins/warp/src/plugin/workflow.rs

@@ -202,7 +202,7 @@ pub fn run_matcher(view: &BinaryView) {
                             matched_count.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
                             // We were able to find a match, add it to the match cache and then mark the function
                             // as requiring updates; this is so that we know about it in the applier activity.
-                            insert_cached_function_match(function, Some(matched_function.clone()));
+                            insert_cached_function_match(function, Some(matched_function));
                         }
                     }
                 });