[Rust] Parent type related modules to types

- Improves the discoverability
- Seperated out much of the types code into more subfiles, such as `structure`, `enumeration` and `qualified_name

Author: emesare

rust/examples/dump_type_library.rs

@@ -2,8 +2,7 @@
 
 use binaryninja::binary_view::BinaryView;
 use binaryninja::file_metadata::FileMetadata;
-use binaryninja::type_library::TypeLibrary;
-use binaryninja::type_printer::{CoreTypePrinter, TokenEscapingType};
+use binaryninja::types::{CoreTypePrinter, TokenEscapingType, TypeLibrary};
 
 fn main() {
     let type_lib_str = std::env::args().nth(1).expect("No type library provided");

rust/examples/type_printer.rs

@@ -1,5 +1,6 @@
-use binaryninja::type_printer::{CoreTypePrinter, TokenEscapingType};
-use binaryninja::types::{MemberAccess, MemberScope, Structure, StructureMember, Type};
+use binaryninja::types::{
+    CoreTypePrinter, MemberAccess, MemberScope, Structure, StructureMember, TokenEscapingType, Type,
+};
 
 fn main() {
     println!("Starting session...");

rust/src/binary_view.rs

@@ -49,10 +49,9 @@ use crate::settings::Settings;
 use crate::string::*;
 use crate::symbol::{Symbol, SymbolType};
 use crate::tags::{Tag, TagType};
-use crate::type_container::TypeContainer;
-use crate::type_library::TypeLibrary;
 use crate::types::{
     NamedTypeReference, QualifiedName, QualifiedNameAndType, QualifiedNameTypeAndId, Type,
+    TypeArchive, TypeContainer, TypeLibrary,
 };
 use crate::variable::DataVariable;
 use crate::Endianness;

rust/src/collaboration/sync.rs

@@ -13,7 +13,7 @@ use crate::progress::{NoProgressCallback, ProgressCallback};
 use crate::project::file::ProjectFile;
 use crate::rc::Ref;
 use crate::string::{raw_to_string, BnString, IntoCStr};
-use crate::type_archive::{TypeArchive, TypeArchiveMergeConflict};
+use crate::types::{TypeArchive, TypeArchiveMergeConflict};
 
 /// Get the default directory path for a remote Project. This is based off the Setting for
 /// collaboration.directory, the project's id, and the project's remote's id.

rust/src/component.rs

@@ -1,15 +1,16 @@
-use crate::binary_view::{BinaryView, BinaryViewExt};
-use crate::function::Function;
-use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable};
-use crate::string::{BnString, IntoCStr};
-use crate::types::ComponentReferencedType;
 use std::ffi::c_char;
 use std::fmt::Debug;
 use std::ptr::NonNull;
 
-use crate::variable::DataVariable;
 use binaryninjacore_sys::*;
 
+use crate::binary_view::{BinaryView, BinaryViewExt};
+use crate::function::Function;
+use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable};
+use crate::string::{BnString, IntoCStr};
+use crate::types::Type;
+use crate::variable::DataVariable;
+
 pub struct ComponentBuilder {
     view: Ref<BinaryView>,
     parent: Option<String>,
@@ -304,3 +305,24 @@ unsafe impl CoreArrayProviderInner for Component {
         Guard::new(Self::from_raw(raw_ptr), context)
     }
 }
+
+// TODO: Remove this struct, or make it not a ZST with a terrible array provider.
+/// ZST used only for `Array<ComponentReferencedType>`.
+pub struct ComponentReferencedType;
+
+impl CoreArrayProvider for ComponentReferencedType {
+    type Raw = *mut BNType;
+    type Context = ();
+    type Wrapped<'a> = &'a Type;
+}
+
+unsafe impl CoreArrayProviderInner for ComponentReferencedType {
+    unsafe fn free(raw: *mut Self::Raw, count: usize, _context: &Self::Context) {
+        BNComponentFreeReferencedTypes(raw, count)
+    }
+
+    unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, _context: &'a Self::Context) -> Self::Wrapped<'a> {
+        // SAFETY: &*mut BNType == &Type (*mut BNType == Type)
+        std::mem::transmute(raw)
+    }
+}

rust/src/language_representation.rs

@@ -14,8 +14,7 @@ use crate::high_level_il::{HighLevelExpressionIndex, HighLevelILFunction};
 use crate::line_formatter::CoreLineFormatter;
 use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Ref, RefCountable};
 use crate::string::{BnString, IntoCStr};
-use crate::type_parser::CoreTypeParser;
-use crate::type_printer::CoreTypePrinter;
+use crate::types::{CoreTypeParser, CoreTypePrinter};
 
 pub type InstructionTextTokenContext = BNInstructionTextTokenContext;
 pub type ScopeType = BNScopeType;

rust/src/lib.rs

@@ -79,11 +79,6 @@ pub mod string;
 pub mod symbol;
 pub mod tags;
 pub mod template_simplifier;
-pub mod type_archive;
-pub mod type_container;
-pub mod type_library;
-pub mod type_parser;
-pub mod type_printer;
 pub mod types;
 pub mod update;
 pub mod variable;

rust/src/platform.rs

@@ -14,14 +14,14 @@
 
 //! Contains all information related to the execution environment of the binary, mainly the calling conventions used
 
-use crate::type_container::TypeContainer;
-use crate::type_parser::{TypeParserError, TypeParserErrorSeverity, TypeParserResult};
+use crate::types::{
+    TypeContainer, TypeLibrary, TypeParserError, TypeParserErrorSeverity, TypeParserResult,
+};
 use crate::{
     architecture::{Architecture, CoreArchitecture},
     calling_convention::CoreCallingConvention,
     rc::*,
     string::*,
-    type_library::TypeLibrary,
     types::QualifiedNameAndType,
 };
 use binaryninjacore_sys::*;

rust/src/string.rs

@@ -24,8 +24,6 @@ use std::ops::Deref;
 use std::path::{Path, PathBuf};
 
 use crate::rc::*;
-use crate::type_archive::TypeArchiveSnapshotId;
-use crate::types::QualifiedName;
 
 // TODO: Remove or refactor this.
 pub(crate) fn raw_to_string(ptr: *const c_char) -> Option<String> {
@@ -263,14 +261,6 @@ impl IntoCStr for Cow<'_, str> {
     }
 }
 
-impl IntoCStr for &QualifiedName {
-    type Result = CString;
-
-    fn to_cstr(self) -> Self::Result {
-        self.to_string().to_cstr()
-    }
-}
-
 impl IntoCStr for PathBuf {
     type Result = CString;
 
@@ -288,14 +278,6 @@ impl IntoCStr for &Path {
     }
 }
 
-impl IntoCStr for TypeArchiveSnapshotId {
-    type Result = CString;
-
-    fn to_cstr(self) -> Self::Result {
-        self.to_string().to_cstr()
-    }
-}
-
 pub trait IntoJson {
     type Output: IntoCStr;