Move code_id_for_object

Author: KingCol13

samply-debugid/src/codeid.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use object::Object;
 use uuid::Uuid;
 
 /// An enum carrying an identifier for a binary. This is stores the same information
@@ -146,3 +147,20 @@ impl std::fmt::Display for ElfBuildId {
         Ok(())
     }
 }
+
+/// Tries to obtain a CodeId for an object.
+///
+/// This currently only handles mach-O and ELF.
+pub fn code_id_for_object<'data>(obj: &impl Object<'data>) -> Option<CodeId> {
+    // ELF
+    if let Ok(Some(build_id)) = obj.build_id() {
+        return Some(CodeId::ElfBuildId(ElfBuildId::from_bytes(build_id)));
+    }
+
+    // mach-O
+    if let Ok(Some(uuid)) = obj.mach_uuid() {
+        return Some(CodeId::MachoUuid(Uuid::from_bytes(uuid)));
+    }
+
+    None
+}

samply-debugid/src/debugid.rs

@@ -2,8 +2,6 @@ use debugid::DebugId;
 use object::{Object, ObjectSection};
 use uuid::Uuid;
 
-use crate::{CodeId, ElfBuildId};
-
 pub trait DebugIdExt {
     /// Creates a DebugId from some identifier. The identifier could be
     /// an ELF build ID, or a hash derived from the text section.
@@ -96,20 +94,3 @@ pub fn debug_id_for_object<'data>(obj: &impl Object<'data>) -> Option<DebugId> {
 
     None
 }
-
-/// Tries to obtain a CodeId for an object.
-///
-/// This currently only handles mach-O and ELF.
-pub fn code_id_for_object<'data>(obj: &impl Object<'data>) -> Option<CodeId> {
-    // ELF
-    if let Ok(Some(build_id)) = obj.build_id() {
-        return Some(CodeId::ElfBuildId(ElfBuildId::from_bytes(build_id)));
-    }
-
-    // mach-O
-    if let Ok(Some(uuid)) = obj.mach_uuid() {
-        return Some(CodeId::MachoUuid(Uuid::from_bytes(uuid)));
-    }
-
-    None
-}

samply-debugid/src/lib.rs

@@ -1,5 +1,5 @@
 mod codeid;
 mod debugid;
 
-pub use codeid::{CodeId, ElfBuildId, PeCodeId};
-pub use debugid::{code_id_for_object, debug_id_for_object, DebugIdExt};
+pub use codeid::{code_id_for_object, CodeId, ElfBuildId, PeCodeId};
+pub use debugid::{debug_id_for_object, DebugIdExt};