Move BinaryReader and BinaryWriter into binary_view module in Rust API

Both of these are associated directly to a `BinaryView` and only exist as accessors onto it.

Author: emesare

rust/src/binary_view.rs

@@ -26,7 +26,6 @@ use binaryninjacore_sys::*;
 use crate::architecture::{Architecture, CoreArchitecture};
 use crate::base_detection::BaseAddressDetection;
 use crate::basic_block::BasicBlock;
-use crate::binary_view::memory_map::MemoryMap;
 use crate::component::Component;
 use crate::confidence::Conf;
 use crate::data_buffer::DataBuffer;
@@ -66,6 +65,12 @@ use std::{result, slice};
 // TODO : general reorg of modules related to bv
 
 pub mod memory_map;
+pub mod reader;
+pub mod writer;
+
+pub use memory_map::MemoryMap;
+pub use reader::BinaryReader;
+pub use writer::BinaryWriter;
 
 pub type Result<R> = result::Result<R, ()>;
 pub type BinaryViewEventType = BNBinaryViewEventType;

rust/src/binary_reader.rs rust/src/binary_view/reader.rsrust/src/binary_reader.rs renamed to rust/src/binary_view/reader.rs

@@ -68,12 +68,12 @@ impl BinaryReader {
         unsafe { BNSetBinaryReaderVirtualBase(self.handle, virtual_base_addr) }
     }
 
-    /// Prefer using [crate::binary_reader::BinaryReader::seek] over this.
+    /// Prefer using [crate::reader::BinaryReader::seek] over this.
     pub fn seek_to_offset(&mut self, offset: u64) {
         unsafe { BNSeekBinaryReader(self.handle, offset) }
     }
 
-    /// Prefer using [crate::binary_reader::BinaryReader::seek] over this.
+    /// Prefer using [crate::reader::BinaryReader::seek] over this.
     pub fn seek_to_relative_offset(&mut self, offset: i64) {
         unsafe { BNSeekBinaryReaderRelative(self.handle, offset) }
     }

rust/src/binary_writer.rs rust/src/binary_view/writer.rsrust/src/binary_writer.rs renamed to rust/src/binary_view/writer.rs

@@ -32,9 +32,7 @@ pub mod architecture;
 pub mod background_task;
 pub mod base_detection;
 pub mod basic_block;
-pub mod binary_reader;
 pub mod binary_view;
-pub mod binary_writer;
 pub mod calling_convention;
 pub mod collaboration;
 pub mod command;

rust/src/lib.rs

@@ -1,5 +1,4 @@
-use binaryninja::binary_reader::BinaryReader;
-use binaryninja::binary_view::{BinaryViewBase, BinaryViewExt};
+use binaryninja::binary_view::{BinaryReader, BinaryViewBase, BinaryViewExt};
 use binaryninja::headless::Session;
 use std::io::{Read, Seek, SeekFrom};
 use std::path::PathBuf;

rust/tests/binary_reader.rs

@@ -1,6 +1,4 @@
-use binaryninja::binary_reader::BinaryReader;
-use binaryninja::binary_view::{BinaryViewBase, BinaryViewExt};
-use binaryninja::binary_writer::BinaryWriter;
+use binaryninja::binary_view::{BinaryReader, BinaryViewBase, BinaryViewExt, BinaryWriter};
 use binaryninja::headless::Session;
 use std::io::{Read, Seek, SeekFrom, Write};
 use std::path::PathBuf;