encounter/object
0
0
Fork 0
mirror of https://github.com/encounter/object.git synced 2026-03-30 11:32:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Segment and Section impls

Browse Source 
Can't do the same for File because of associated types.
This commit is contained in:
Philip Craig
2017-11-03 12:53:49 +10:00
parent b5e6b56823
commit ff552047c3
1 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+27 -36
View File
@@ -241,33 +241,30 @@ impl<'a> fmt::Debug for Segment<'a> {
}
}
impl<'a> Segment<'a> {
fn inner(&self) -> &ObjectSegment<'a> {
match self.inner {
SegmentInternal::Elf(ref elf) => elf,
SegmentInternal::MachO(ref macho) => macho,
}
}
}
impl<'a> ObjectSegment<'a> for Segment<'a> {
fn address(&self) -> u64 {
match self.inner {
SegmentInternal::Elf(ref elf) => elf.address(),
SegmentInternal::MachO(ref macho) => macho.address(),
}
self.inner().address()
}
fn size(&self) -> u64 {
match self.inner {
SegmentInternal::Elf(ref elf) => elf.size(),
SegmentInternal::MachO(ref macho) => macho.size(),
}
self.inner().size()
}
fn data(&self) -> &'a [u8] {
match self.inner {
SegmentInternal::Elf(ref elf) => elf.data(),
SegmentInternal::MachO(ref macho) => macho.data(),
}
self.inner().data()
}
fn name(&self) -> Option<&str> {
match self.inner {
SegmentInternal::Elf(ref elf) => elf.name(),
SegmentInternal::MachO(ref macho) => macho.name(),
}
self.inner().name()
}
}
@@ -301,40 +298,34 @@ impl<'a> fmt::Debug for Section<'a> {
}
}
impl<'a> Section<'a> {
fn inner(&self) -> &ObjectSection<'a> {
match self.inner {
SectionInternal::Elf(ref elf) => elf,
SectionInternal::MachO(ref macho) => macho,
}
}
}
impl<'a> ObjectSection<'a> for Section<'a> {
fn address(&self) -> u64 {
match self.inner {
SectionInternal::Elf(ref elf) => elf.address(),
SectionInternal::MachO(ref macho) => macho.address(),
}
self.inner().address()
}
fn size(&self) -> u64 {
match self.inner {
SectionInternal::Elf(ref elf) => elf.size(),
SectionInternal::MachO(ref macho) => macho.size(),
}
self.inner().size()
}
fn data(&self) -> &'a [u8] {
match self.inner {
SectionInternal::Elf(ref elf) => elf.data(),
SectionInternal::MachO(ref macho) => macho.data(),
}
self.inner().data()
}
fn name(&self) -> Option<&str> {
match self.inner {
SectionInternal::Elf(ref elf) => elf.name(),
SectionInternal::MachO(ref macho) => macho.name(),
}
self.inner().name()
}
fn segment_name(&self) -> Option<&str> {
match self.inner {
SectionInternal::Elf(ref elf) => elf.segment_name(),
SectionInternal::MachO(ref macho) => macho.segment_name(),
}
self.inner().segment_name()
}
}