[Rust] Move architecture module code into more reasonable files

To keep backwards compatibility for commonly referenced code we re-export them within the architecture module.

Also does some light refactoring of some newly added APIs to keep them more consistent with other parts of the codebase.

1 files changed, 2 insertions, 3 deletions

diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 476cd04c..50913ed8 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -94,6 +94,8 @@ pub mod workflow;
 
 use crate::file_metadata::FileMetadata;
 use crate::function::Function;
+use crate::progress::{NoProgressCallback, ProgressCallback};
+use crate::string::raw_to_string;
 use binary_view::BinaryView;
 use binaryninjacore_sys::*;
 use metadata::Metadata;
@@ -107,9 +109,6 @@ use string::BnString;
 use string::IntoCStr;
 use string::IntoJson;
 
-use crate::progress::{NoProgressCallback, ProgressCallback};
-use crate::string::raw_to_string;
-pub use binaryninjacore_sys::BNBranchType as BranchType;
 pub use binaryninjacore_sys::BNDataFlowQueryOption as DataFlowQueryOption;
 pub use binaryninjacore_sys::BNEndianness as Endianness;
 pub use binaryninjacore_sys::BNILBranchDependence as ILBranchDependence;