Fix registration of Rust arch plugins with context

Author: zznop

rust/src/architecture.rs

@@ -673,8 +673,14 @@ impl FunctionLifterContext {
         let mut auto_indirect_branches: HashMap<Location, HashSet<Location>> = HashMap::new();
         for i in 0..flc_ref.indirectBranchesCount {
             let entry = unsafe { *flc_ref.indirectBranches.add(i) };
-            let src = Location::new(Some(CoreArchitecture::from_raw(entry.sourceArch)), entry.sourceAddr);
-            let dest = Location::new(Some(CoreArchitecture::from_raw(entry.destArch)), entry.destAddr);
+            let src = Location::new(
+                Some(CoreArchitecture::from_raw(entry.sourceArch)),
+                entry.sourceAddr,
+            );
+            let dest = Location::new(
+                Some(CoreArchitecture::from_raw(entry.destArch)),
+                entry.destAddr,
+            );
             if entry.autoDefined {
                 auto_indirect_branches
                     .entry(src)
@@ -2738,7 +2744,6 @@ where
 
     unsafe {
         let res = BNRegisterArchitecture(name.as_ptr(), &mut custom_arch as *mut _);
-
         assert!(!res.is_null());
 
         (*raw).arch.assume_init_mut()
@@ -2814,7 +2819,8 @@ where
         true
     }
 
-    register_architecture_impl(name, func, |custom_arch| {
+
+    return register_architecture_impl(name, func, |custom_arch| {
         custom_arch.freeFunctionArchContext = Some(cb_free_function_arch_context_typed::<A>);
         custom_arch.getInstructionTextWithContext =
             Some(cb_get_instruction_text_with_context_typed::<A>);