Misc formatting and clippy lints

Vector35 · Aug 24, 2024 · 35fe347 · 35fe347
1 parent 04d268c
commit 35fe347
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/rust/examples/dwarf/dwarf_import/src/dwarfdebuginfo.rs b/rust/examples/dwarf/dwarf_import/src/dwarfdebuginfo.rs
@@ -285,8 +285,7 @@ impl DebugInfoBuilder {
 
                 return Some(*idx);
             }
-        }
-        else {
+        } else {
             debug!("Function entry in DWARF without full or raw name.");
             return None;
         }

diff --git a/rust/src/binaryview.rs b/rust/src/binaryview.rs
@@ -1371,7 +1371,7 @@ pub trait BinaryViewExt: BinaryViewBase {
         let ranges = unsafe {
             let mut count = 0;
             let reloc_ranges_ptr = BNGetRelocationRanges(self.as_ref().handle, &mut count);
-            let ranges = std::slice::from_raw_parts(reloc_ranges_ptr, count).clone();
+            let ranges = std::slice::from_raw_parts(reloc_ranges_ptr, count);
             BNFreeRelocationRanges(reloc_ranges_ptr);
             ranges
         };

diff --git a/rust/src/callingconvention.rs b/rust/src/callingconvention.rs
@@ -305,11 +305,8 @@ where
         C: CallingConventionBase,
     {
         ffi_wrap!("CallingConvention::incoming_reg_value", unsafe {
-            //let ctxt = &*(ctxt as *mut CustomCallingConventionContext<C>);
-            let val = &mut *val;
-
-            val.state = BNRegisterValueType::EntryValue;
-            val.value = _reg as i64;
+            (*val).state = BNRegisterValueType::EntryValue;
+            (*val).value = _reg as i64;
         })
     }
 
@@ -323,11 +320,8 @@ where
         C: CallingConventionBase,
     {
         ffi_wrap!("CallingConvention::incoming_flag_value", unsafe {
-            //let ctxt = &*(ctxt as *mut CustomCallingConventionContext<C>);
-            let val = &mut *val;
-
-            val.state = BNRegisterValueType::EntryValue;
-            val.value = _flag as i64;
+            (*val).state = BNRegisterValueType::EntryValue;
+            (*val).value = _flag as i64;
         })
     }
 
@@ -341,10 +335,7 @@ where
     {
         ffi_wrap!("CallingConvention::incoming_var_for_param", unsafe {
             let ctxt = &*(ctxt as *mut CustomCallingConventionContext<C>);
-            ptr::write(
-                param,
-                BNGetDefaultIncomingVariableForParameterVariable(ctxt.raw_handle, var),
-            );
+            *param = BNGetDefaultIncomingVariableForParameterVariable(ctxt.raw_handle, var);
         })
     }
 
@@ -358,10 +349,7 @@ where
     {
         ffi_wrap!("CallingConvention::incoming_param_for_var", unsafe {
             let ctxt = &*(ctxt as *mut CustomCallingConventionContext<C>);
-            ptr::write(
-                param,
-                BNGetDefaultParameterVariableForIncomingVariable(ctxt.raw_handle, var),
-            );
+            *param = BNGetDefaultParameterVariableForIncomingVariable(ctxt.raw_handle, var);
         })
     }
 

diff --git a/rust/src/enterprise.rs b/rust/src/enterprise.rs
@@ -15,7 +15,9 @@ pub fn server_url() -> BnString {
 pub fn set_server_url<S: BnStrCompatible>(url: S) -> Result<(), ()> {
     let url = url.into_bytes_with_nul();
     let result = unsafe {
-        binaryninjacore_sys::BNSetEnterpriseServerUrl(url.as_ref().as_ptr() as *const std::os::raw::c_char)
+        binaryninjacore_sys::BNSetEnterpriseServerUrl(
+            url.as_ref().as_ptr() as *const std::os::raw::c_char
+        )
     };
     if result {
         Ok(())