[Rust] Misc binary_view module refactoring

arch/msp430/src/lib.rs

@@ -1,9 +1,6 @@
 use binaryninja::{
-    add_optional_plugin_dependency,
-    architecture::ArchitectureExt,
-    calling_convention,
-    custom_binary_view::{BinaryViewType, BinaryViewTypeExt},
-    Endianness,
+    add_optional_plugin_dependency, architecture::ArchitectureExt, binary_view::BinaryViewType,
+    calling_convention, Endianness,
 };
 
 mod architecture;
@@ -45,7 +42,7 @@ pub extern "C" fn CorePluginInit() -> bool {
 
     arch.set_default_calling_convention(&default);
 
-    if let Ok(bvt) = BinaryViewType::by_name("ELF") {
+    if let Some(bvt) = BinaryViewType::by_name("ELF") {
         bvt.register_arch(105, Endianness::LittleEndian, arch);
     }
 

arch/riscv/src/lib.rs

@@ -13,9 +13,8 @@ use binaryninja::{
         ImplicitRegisterExtend, InstructionInfo, Register as Reg, RegisterInfo, UnusedFlag,
         UnusedRegisterStack,
     },
-    binary_view::{BinaryView, BinaryViewExt},
+    binary_view::{BinaryView, BinaryViewType},
     calling_convention::{register_calling_convention, CallingConvention, ConventionBuilder},
-    custom_binary_view::{BinaryViewType, BinaryViewTypeExt},
     disassembly::{InstructionTextToken, InstructionTextTokenKind},
     function::Function,
     function_recognizer::FunctionRecognizer,
@@ -3101,7 +3100,7 @@ pub extern "C" fn CorePluginInit() -> bool {
     );
     arch64.set_default_calling_convention(&cc64);
 
-    if let Ok(bvt) = BinaryViewType::by_name("ELF") {
+    if let Some(bvt) = BinaryViewType::by_name("ELF") {
         bvt.register_arch(
             (1 << 16) | 243,
             binaryninja::Endianness::LittleEndian,

plugins/bntl_utils/src/command/create.rs

@@ -2,7 +2,7 @@ use crate::command::{InputDirectoryField, OutputDirectoryField};
 use crate::process::{new_processing_state_background_thread, TypeLibProcessor};
 use crate::validate::TypeLibValidater;
 use binaryninja::background_task::BackgroundTask;
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::BinaryView;
 use binaryninja::command::{Command, GlobalCommand, ProjectCommand};
 use binaryninja::interaction::{Form, FormInputField, MessageBoxButtonSet, MessageBoxIcon};
 use binaryninja::platform::Platform;

plugins/bntl_utils/src/dump.rs

@@ -1,4 +1,4 @@
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::BinaryView;
 use binaryninja::file_metadata::FileMetadata;
 use binaryninja::metadata::{Metadata, MetadataType};
 use binaryninja::platform::Platform;

plugins/bntl_utils/src/process.rs

@@ -20,8 +20,7 @@ use crate::schema::BntlSchema;
 use crate::tbd::{parse_tbd_info, TbdArchitecture};
 use crate::winmd::WindowsMetadataImporter;
 use binaryninja::background_task::BackgroundTask;
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
-use binaryninja::custom_binary_view::BinaryViewType;
+use binaryninja::binary_view::{BinaryView, BinaryViewType};
 use binaryninja::file_metadata::FileMetadata;
 use binaryninja::metadata::Metadata;
 use binaryninja::platform::Platform;

plugins/dwarf/dwarf_export/src/lib.rs

@@ -2,7 +2,7 @@ mod edit_distance;
 
 use binaryninja::interaction::form::{Form, FormInputField};
 use binaryninja::{
-    binary_view::{BinaryView, BinaryViewBase, BinaryViewExt},
+    binary_view::{BinaryView, BinaryViewBase},
     command::{register_command, Command},
     confidence::Conf,
     rc::Ref,

plugins/dwarf/dwarf_import/src/dwarfdebuginfo.rs

@@ -19,7 +19,7 @@ use crate::{
 };
 
 use binaryninja::{
-    binary_view::{BinaryView, BinaryViewBase, BinaryViewExt},
+    binary_view::{BinaryView, BinaryViewBase},
     debuginfo::{DebugFunctionInfo, DebugInfo},
     platform::Platform,
     rc::*,

plugins/dwarf/dwarf_import/src/helpers.rs

@@ -19,7 +19,7 @@ use crate::{DebugInfoBuilderContext, ReaderType};
 use binaryninja::binary_view::BinaryViewBase;
 use binaryninja::Endianness;
 use binaryninja::{
-    binary_view::{BinaryView, BinaryViewExt},
+    binary_view::BinaryView,
     download::{DownloadInstanceInputOutputCallbacks, DownloadProvider},
     settings::Settings,
 };

plugins/dwarf/dwarf_import/src/lib.rs

@@ -30,7 +30,7 @@ use crate::types::parse_variable;
 
 use binaryninja::binary_view::BinaryViewBase;
 use binaryninja::{
-    binary_view::{BinaryView, BinaryViewExt},
+    binary_view::BinaryView,
     debuginfo::{CustomDebugInfoParser, DebugInfo, DebugInfoParser},
     settings::Settings,
     template_simplifier::simplify_str_to_str,

plugins/dwarf/dwarfdump/src/lib.rs

@@ -14,7 +14,7 @@
 
 use binaryninja::{
     architecture::BranchType,
-    binary_view::{BinaryView, BinaryViewExt},
+    binary_view::BinaryView,
     command::{register_command, Command},
     disassembly::{DisassemblyTextLine, InstructionTextToken, InstructionTextTokenKind},
     flowgraph::{EdgeStyle, FlowGraph, FlowGraphNode, FlowGraphOption},

plugins/dwarf/shared/src/lib.rs

@@ -16,7 +16,7 @@ use gimli::{EndianRcSlice, Endianity, RunTimeEndian, SectionId};
 use object::{Object, ObjectSection};
 
 use binaryninja::{
-    binary_view::{BinaryView, BinaryViewBase, BinaryViewExt},
+    binary_view::{BinaryView, BinaryViewBase},
     settings::Settings,
     Endianness,
 };

plugins/idb_import/src/commands/load_file.rs

@@ -1,7 +1,7 @@
 use crate::commands::LoadFileField;
 use crate::mapper::IDBMapper;
 use crate::parse::IDBFileParser;
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::BinaryView;
 use binaryninja::command::Command;
 use binaryninja::interaction::Form;
 use std::fs::File;

plugins/idb_import/src/mapper.rs

@@ -6,7 +6,7 @@ use crate::parse::{
 };
 use crate::translate::TILTranslator;
 use binaryninja::architecture::Architecture;
-use binaryninja::binary_view::{BinaryView, BinaryViewBase, BinaryViewExt};
+use binaryninja::binary_view::{BinaryView, BinaryViewBase};
 use binaryninja::qualified_name::QualifiedName;
 use binaryninja::rc::Ref;
 use binaryninja::section::{SectionBuilder, Semantics};

plugins/idb_import/src/types.rs

@@ -3,7 +3,7 @@ use std::num::{NonZeroU16, NonZeroU8};
 
 use anyhow::{anyhow, Result};
 use binaryninja::architecture::{Architecture, ArchitectureExt, CoreArchitecture};
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::{BinaryView};
 use binaryninja::calling_convention::CoreCallingConvention;
 use binaryninja::confidence::Conf;
 use binaryninja::rc::Ref;

plugins/pdb-ng/src/lib.rs

@@ -23,7 +23,7 @@ use std::{env, fs};
 use anyhow::{anyhow, Result};
 use pdb::PDB;
 
-use binaryninja::binary_view::{BinaryView, BinaryViewBase, BinaryViewExt};
+use binaryninja::binary_view::{BinaryView, BinaryViewBase};
 use binaryninja::debuginfo::{CustomDebugInfoParser, DebugInfo, DebugInfoParser};
 use binaryninja::download::{DownloadInstanceInputOutputCallbacks, DownloadProvider};
 use binaryninja::interaction::{MessageBoxButtonResult, MessageBoxButtonSet};
@@ -275,23 +275,14 @@ fn search_sym_store(
 
 fn parse_pdb_info(view: &BinaryView) -> Option<PDBInfo> {
     match view.get_metadata::<u64>("DEBUG_INFO_TYPE") {
-        Some(Ok(0x53445352 /* 'SDSR' */)) => {}
+        Some(0x53445352 /* 'SDSR' */) => {}
         _ => return None,
     }
 
     // This is stored in the BV by the PE loader
-    let file_path = match view.get_metadata::<String>("PDB_FILENAME") {
-        Some(Ok(md)) => md,
-        _ => return None,
-    };
-    let mut guid = match view.get_metadata::<Vec<u8>>("PDB_GUID") {
-        Some(Ok(md)) => md,
-        _ => return None,
-    };
-    let age = match view.get_metadata::<u64>("PDB_AGE") {
-        Some(Ok(md)) => md as u32,
-        _ => return None,
-    };
+    let file_path = view.get_metadata::<String>("PDB_FILENAME")?;
+    let mut guid = view.get_metadata::<Vec<u8>>("PDB_GUID")?;
+    let age = view.get_metadata::<u64>("PDB_AGE")? as u32;
 
     if guid.len() != 16 {
         return None;

plugins/pdb-ng/src/parser.rs

@@ -23,7 +23,7 @@ use pdb::*;
 use crate::symbol_parser::{ParsedDataSymbol, ParsedProcedure, ParsedSymbol};
 use crate::type_parser::ParsedType;
 use binaryninja::architecture::{Architecture, CoreArchitecture};
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::BinaryView;
 use binaryninja::calling_convention::CoreCallingConvention;
 use binaryninja::confidence::{Conf, MIN_CONFIDENCE};
 use binaryninja::debuginfo::{DebugFunctionInfo, DebugInfo};

plugins/pdb-ng/src/type_parser.rs

@@ -19,7 +19,6 @@ use crate::struct_grouper::group_structure;
 use crate::PDBParserInstance;
 use anyhow::{anyhow, Result};
 use binaryninja::architecture::Architecture;
-use binaryninja::binary_view::BinaryViewExt;
 use binaryninja::calling_convention::CoreCallingConvention;
 use binaryninja::confidence::{Conf, MAX_CONFIDENCE};
 use binaryninja::platform::Platform;

plugins/svd/src/lib.rs

@@ -3,7 +3,7 @@ pub mod settings;
 
 use crate::mapper::DeviceMapper;
 use crate::settings::LoadSettings;
-use binaryninja::binary_view::{BinaryView, BinaryViewBase, BinaryViewExt};
+use binaryninja::binary_view::{BinaryView, BinaryViewBase};
 use binaryninja::command::Command;
 use binaryninja::interaction::{Form, FormInputField};
 use binaryninja::workflow::{activity, Activity, AnalysisContext, Workflow};

plugins/svd/src/mapper.rs

@@ -1,5 +1,5 @@
 use crate::settings::LoadSettings;
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::BinaryView;
 use binaryninja::confidence::{Conf, MAX_CONFIDENCE};
 use binaryninja::data_buffer::DataBuffer;
 use binaryninja::rc::Ref;

plugins/svd/tests/mapper.rs

@@ -1,4 +1,3 @@
-use binaryninja::binary_view::BinaryViewExt;
 use binaryninja::binary_view::{BinaryView, BinaryViewBase};
 use binaryninja::file_metadata::FileMetadata;
 use binaryninja::headless::Session;

plugins/warp/benches/convert.rs

@@ -1,4 +1,3 @@
-use binaryninja::binary_view::BinaryViewExt;
 use binaryninja::headless::Session;
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::path::PathBuf;

plugins/warp/benches/function.rs

@@ -1,4 +1,3 @@
-use binaryninja::binary_view::BinaryViewExt;
 use binaryninja::headless::Session;
 use criterion::{criterion_group, criterion_main, Criterion};
 use rayon::prelude::*;

plugins/warp/benches/guid.rs

@@ -1,4 +1,3 @@
-use binaryninja::binary_view::BinaryViewExt;
 use binaryninja::headless::Session;
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::path::PathBuf;

plugins/warp/src/cache.rs

@@ -7,7 +7,7 @@ pub use function::*;
 pub use guid::*;
 pub use type_reference::*;
 
-use binaryninja::binary_view::{BinaryView, BinaryViewExt};
+use binaryninja::binary_view::BinaryView;
 use binaryninja::function::Function as BNFunction;
 use binaryninja::object_destructor::{register_object_destructor, ObjectDestructor};
 use binaryninja::rc::Guard;

plugins/warp/src/cache/function.rs

@@ -1,5 +1,4 @@
 use crate::convert::{comment_to_bn_comment, to_bn_symbol_at_address};
-use binaryninja::binary_view::BinaryViewExt;
 use binaryninja::function::{Function as BNFunction, FunctionUpdateType};
 use binaryninja::symbol::SymbolType;
 use warp::signature::function::Function;