Remove debugid_util.rs

Replace with samply-symbols

Author: KingCol13

samply-symbols/src/binary_image.rs

@@ -5,14 +5,14 @@ use object::read::pe::{ImageNtHeaders, ImageOptionalHeader, PeFile, PeFile32, Pe
 use object::{FileKind, Object, ReadRef};
 use samply_debugid::{CodeId, ElfBuildId, PeCodeId};
 
-use crate::debugid_util::{code_id_for_object, debug_id_for_object};
 use crate::error::Error;
 use crate::jitdump::{debug_id_and_code_id_for_jitdump, JitDumpIndex};
 use crate::macho::{DyldCacheFileData, MachOData, MachOFatArchiveMemberData};
 use crate::shared::{
     relative_address_base, FileAndPathHelperError, FileContents, FileContentsWrapper, LibraryInfo,
     RangeReadRef,
 };
+use samply_debugid::{code_id_for_object, debug_id_for_object};
 
 #[derive(thiserror::Error, Debug)]
 pub enum CodeByteReadingError {

samply-symbols/src/debugid_util.rs

@@ -220,7 +220,6 @@ mod breakpad;
 mod cache;
 mod chunked_read_buffer_manager;
 mod compact_symbol_table;
-mod debugid_util;
 mod demangle;
 mod demangle_ocaml;
 mod dwarf;
@@ -245,7 +244,6 @@ pub use crate::breakpad::{
 };
 pub use crate::cache::{FileByteSource, FileContentsWithChunkedCaching};
 pub use crate::compact_symbol_table::CompactSymbolTable;
-pub use crate::debugid_util::{debug_id_for_object, DebugIdExt};
 pub use crate::demangle::demangle_any;
 pub use crate::error::Error;
 pub use crate::external_file::{load_external_file, ExternalFileSymbolMap};
@@ -263,6 +261,7 @@ pub use crate::shared::{
 };
 pub use crate::source_file_path::{SourceFilePath, SourceFilePathHandle, SourceFilePathIndex};
 pub use crate::symbol_map::{AccessPatternHint, SymbolMap, SymbolMapTrait};
+pub use samply_debugid::{debug_id_for_object, DebugIdExt};
 
 pub struct SymbolManager<H: FileAndPathHelper> {
     helper: Arc<H>,

samply-symbols/src/lib.rs

@@ -14,7 +14,6 @@ use yoke::Yoke;
 use yoke_derive::Yokeable;
 
 use crate::binary_image::{BinaryImage, BinaryImageInner};
-use crate::debugid_util::debug_id_for_object;
 use crate::dwarf::Addr2lineContextData;
 use crate::error::Error;
 use crate::shared::{
@@ -25,6 +24,7 @@ use crate::symbol_map::SymbolMap;
 use crate::symbol_map_object::{
     ObjectSymbolMap, ObjectSymbolMapInnerWrapper, ObjectSymbolMapOuter,
 };
+use samply_debugid::debug_id_for_object;
 
 /// Converts a cpu type/subtype pair into the architecture name.
 ///

samply-symbols/src/macho.rs

@@ -10,7 +10,6 @@ use pdb_addr2line::pdb;
 use yoke::Yoke;
 use yoke_derive::Yokeable;
 
-use crate::debugid_util::debug_id_for_object;
 use crate::dwarf::Addr2lineContextData;
 use crate::error::{Context, Error};
 use crate::generation::SymbolMapGeneration;
@@ -24,6 +23,7 @@ use crate::symbol_map_object::{
     ObjectSymbolMap, ObjectSymbolMapInnerWrapper, ObjectSymbolMapOuter,
 };
 use crate::{demangle, PathInterner, SourceFilePath, SourceFilePathHandle, SyncAddressInfo};
+use samply_debugid::debug_id_for_object;
 
 pub async fn load_symbol_map_for_pdb_corresponding_to_binary<H: FileAndPathHelper>(
     file_kind: FileKind,