From 6acc3ec38633967065bf7978cab8c3b04140d031 Mon Sep 17 00:00:00 2001
From: KyleMiles <krm504@nyu.edu>
Date: Wed, 10 May 2023 10:18:38 -0400
Subject: Rust API : Remove some unused type parameters (this should remove a
 little bit of codegen)...but will likely break custom BV plugins

---
 rust/src/callingconvention.rs | 16 ++++++----------
 rust/src/custombinaryview.rs  |  7 ++-----
 rust/src/lib.rs               |  6 ++----
 3 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'rust/src')

diff --git a/rust/src/callingconvention.rs b/rust/src/callingconvention.rs
index 52d1407c..aa6b71ad 100644
--- a/rust/src/callingconvention.rs
+++ b/rust/src/callingconvention.rs
@@ -286,14 +286,12 @@ where
         })
     }
 
-    extern "C" fn cb_incoming_reg_value<C>(
+    extern "C" fn cb_incoming_reg_value(
         _ctxt: *mut c_void,
         _reg: u32,
         _func: *mut BNFunction,
         val: *mut BNRegisterValue,
-    ) where
-        C: CallingConventionBase,
-    {
+    ) {
         ffi_wrap!("CallingConvention::incoming_reg_value", unsafe {
             //let ctxt = &*(ctxt as *mut CustomCallingConventionContext<C>);
             let val = &mut *val;
@@ -303,14 +301,12 @@ where
         })
     }
 
-    extern "C" fn cb_incoming_flag_value<C>(
+    extern "C" fn cb_incoming_flag_value(
         _ctxt: *mut c_void,
         _flag: u32,
         _func: *mut BNFunction,
         val: *mut BNRegisterValue,
-    ) where
-        C: CallingConventionBase,
-    {
+    ) {
         ffi_wrap!("CallingConvention::incoming_flag_value", unsafe {
             //let ctxt = &*(ctxt as *mut CustomCallingConventionContext<C>);
             let val = &mut *val;
@@ -395,8 +391,8 @@ where
         getGlobalPointerRegister: Some(cb_global_pointer_reg::<C>),
 
         getImplicitlyDefinedRegisters: Some(cb_implicitly_defined_registers::<C>),
-        getIncomingRegisterValue: Some(cb_incoming_reg_value::<C>),
-        getIncomingFlagValue: Some(cb_incoming_flag_value::<C>),
+        getIncomingRegisterValue: Some(cb_incoming_reg_value),
+        getIncomingFlagValue: Some(cb_incoming_flag_value),
         getIncomingVariableForParameterVariable: Some(cb_incoming_var_for_param::<C>),
         getParameterVariableForIncomingVariable: Some(cb_incoming_param_for_var::<C>),
 
diff --git a/rust/src/custombinaryview.rs b/rust/src/custombinaryview.rs
index 90673fb7..aa4eef27 100644
--- a/rust/src/custombinaryview.rs
+++ b/rust/src/custombinaryview.rs
@@ -93,10 +93,7 @@ where
         })
     }
 
-    extern "C" fn cb_parse<T>(_ctxt: *mut c_void, _data: *mut BNBinaryView) -> *mut BNBinaryView
-    where
-        T: CustomBinaryViewType,
-    {
+    extern "C" fn cb_parse(_ctxt: *mut c_void, _data: *mut BNBinaryView) -> *mut BNBinaryView {
         ffi_wrap!("BinaryViewTypeBase::parse", ptr::null_mut())
     }
 
@@ -127,7 +124,7 @@ where
     let mut bn_obj = BNCustomBinaryViewType {
         context: ctxt as *mut _,
         create: Some(cb_create::<T>),
-        parse: Some(cb_parse::<T>),
+        parse: Some(cb_parse),
         isValidForData: Some(cb_valid::<T>),
         isDeprecated: Some(cb_deprecated::<T>),
         getLoadSettingsForData: Some(cb_load_settings::<T>),
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 61016c0f..61358e6c 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -312,11 +312,11 @@ pub fn open_view_with_options<F: AsRef<Path>>(
         _ => {
             if let (Some(universal_view_type), Some(options)) = (universal_view_type, &options) {
                 if options.contains_key("files.universal.architecturePreference") {
-                    let settings = universal_view_type
+                    universal_view_type
                         .load_settings_for_data(view.as_ref())
                         .map_err(|_| {
                             "Could not load settings for universal view_data".to_string()
-                        })?;
+                        })?
 
                     // let arch_list =
                     //     settings.get_string("loader.universal.architectures", None, None);
@@ -331,8 +331,6 @@ pub fn open_view_with_options<F: AsRef<Path>>(
 
                     // let settings = settings::Settings::new(BNGetUniqueIdentifierString());
                     // settings.deserialize_schema(arch_entry[0]['loadSchema']);
-
-                    settings
                 } else {
                     match view_type.load_settings_for_data(view.as_ref()) {
                         Ok(settings) => settings,
-- 
cgit v1.3.1