3 files changed, 6 insertions, 16 deletions
diff --git a/plugins/pdb-ng/src/lib.rs b/plugins/pdb-ng/src/lib.rs
index d6678a17..c3bbdf5e 100644
--- a/plugins/pdb-ng/src/lib.rs
+++ b/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;
diff --git a/plugins/pdb-ng/src/parser.rs b/plugins/pdb-ng/src/parser.rs
index 9db635e8..8c33fe64 100644
--- a/plugins/pdb-ng/src/parser.rs
+++ b/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};
diff --git a/plugins/pdb-ng/src/type_parser.rs b/plugins/pdb-ng/src/type_parser.rs
index 026a421a..bccb93f1 100644
--- a/plugins/pdb-ng/src/type_parser.rs
+++ b/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;