[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.

2 files changed, 5 insertions, 4 deletions

diff --git a/rust/src/flowgraph/edge.rs b/rust/src/flowgraph/edge.rs
index 7862f156..38e0ae9e 100644
--- a/rust/src/flowgraph/edge.rs
+++ b/rust/src/flowgraph/edge.rs
@@ -1,8 +1,8 @@
-use binaryninjacore_sys::*;
-
+use crate::architecture::BranchType;
 use crate::flowgraph::node::FlowGraphNode;
-use crate::flowgraph::{BranchType, EdgePenStyle, ThemeColor};
+use crate::flowgraph::{EdgePenStyle, ThemeColor};
 use crate::rc::{CoreArrayProvider, CoreArrayProviderInner, Ref};
+use binaryninjacore_sys::*;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct FlowGraphEdge {
diff --git a/rust/src/flowgraph/node.rs b/rust/src/flowgraph/node.rs
index 5c2b9248..28233670 100644
--- a/rust/src/flowgraph/node.rs
+++ b/rust/src/flowgraph/node.rs
@@ -1,7 +1,8 @@
+use crate::architecture::BranchType;
 use crate::basic_block::{BasicBlock, BlockContext};
 use crate::disassembly::DisassemblyTextLine;
 use crate::flowgraph::edge::{EdgeStyle, FlowGraphEdge};
-use crate::flowgraph::{BranchType, FlowGraph};
+use crate::flowgraph::FlowGraph;
 use crate::function::HighlightColor;
 use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable};
 use binaryninjacore_sys::*;