From 3fb82e6ca580f6565f55e877fd815c7370613187 Mon Sep 17 00:00:00 2001 From: toku-sa-n Date: Tue, 30 Mar 2021 10:45:18 +0900 Subject: [PATCH] refactor: use `?` instead of `try!` Not all `try!`s were removed in the previous PR. --- src/dynamic.rs | 4 ++-- src/program.rs | 18 +++++++++--------- src/sections.rs | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/dynamic.rs b/src/dynamic.rs index 93f5ef8..0c72d23 100644 --- a/src/dynamic.rs +++ b/src/dynamic.rs @@ -63,7 +63,7 @@ macro_rules! impls { } pub fn get_val(&self) -> Result<$p, &'static str> { - match try!(self.get_tag()) { + match self.get_tag()? { Tag::Needed | Tag::PltRelSize | Tag::RelaSize | Tag::RelaEnt | Tag::StrSize | Tag::SymEnt | Tag::SoName | Tag::RPath | Tag::RelSize | Tag::RelEnt | Tag::PltRel | Tag::InitArraySize | Tag::FiniArraySize | Tag::RunPath | Tag::Flags | @@ -74,7 +74,7 @@ macro_rules! impls { } pub fn get_ptr(&self) -> Result<$p, &'static str> { - match try!(self.get_tag()) { + match self.get_tag()? { Tag::Pltgot | Tag::Hash | Tag::StrTab | Tag::SymTab | Tag::Rela | Tag::Init | Tag::Fini | Tag::Rel | Tag::Debug | Tag::JmpRel | Tag::InitArray | Tag::FiniArray | Tag::PreInitArray | Tag::SymTabShIndex | Tag::OsSpecific(_) | Tag::ProcessorSpecific(_) diff --git a/src/program.rs b/src/program.rs index 39f5636..66153f6 100644 --- a/src/program.rs +++ b/src/program.rs @@ -176,15 +176,15 @@ macro_rules! ph_impl { impl fmt::Display for $ph { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(writeln!(f, "Program header:")); - try!(writeln!(f, " type: {:?}", self.get_type())); - try!(writeln!(f, " flags: {}", self.flags)); - try!(writeln!(f, " offset: {:#x}", self.offset)); - try!(writeln!(f, " virtual address: {:#x}", self.virtual_addr)); - try!(writeln!(f, " physical address: {:#x}", self.physical_addr)); - try!(writeln!(f, " file size: {:#x}", self.file_size)); - try!(writeln!(f, " memory size: {:#x}", self.mem_size)); - try!(writeln!(f, " align: {:#x}", self.align)); + writeln!(f, "Program header:")?; + writeln!(f, " type: {:?}", self.get_type())?; + writeln!(f, " flags: {}", self.flags)?; + writeln!(f, " offset: {:#x}", self.offset)?; + writeln!(f, " virtual address: {:#x}", self.virtual_addr)?; + writeln!(f, " physical address: {:#x}", self.physical_addr)?; + writeln!(f, " file size: {:#x}", self.file_size)?; + writeln!(f, " memory size: {:#x}", self.mem_size)?; + writeln!(f, " align: {:#x}", self.align)?; Ok(()) } } diff --git a/src/sections.rs b/src/sections.rs index 78ac735..789d9ad 100644 --- a/src/sections.rs +++ b/src/sections.rs @@ -223,16 +223,16 @@ impl<'a> fmt::Display for SectionHeader<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { macro_rules! sh_display { ($sh: ident) => {{ - try!(writeln!(f, "Section header:")); - try!(writeln!(f, " name: {:?}", $sh.name)); - try!(writeln!(f, " type: {:?}", self.get_type())); - try!(writeln!(f, " flags: {:?}", $sh.flags)); - try!(writeln!(f, " address: {:?}", $sh.address)); - try!(writeln!(f, " offset: {:?}", $sh.offset)); - try!(writeln!(f, " size: {:?}", $sh.size)); - try!(writeln!(f, " link: {:?}", $sh.link)); - try!(writeln!(f, " align: {:?}", $sh.align)); - try!(writeln!(f, " entry size: {:?}", $sh.entry_size)); + writeln!(f, "Section header:")?; + writeln!(f, " name: {:?}", $sh.name)?; + writeln!(f, " type: {:?}", self.get_type())?; + writeln!(f, " flags: {:?}", $sh.flags)?; + writeln!(f, " address: {:?}", $sh.address)?; + writeln!(f, " offset: {:?}", $sh.offset)?; + writeln!(f, " size: {:?}", $sh.size)?; + writeln!(f, " link: {:?}", $sh.link)?; + writeln!(f, " align: {:?}", $sh.align)?; + writeln!(f, " entry size: {:?}", $sh.entry_size)?; Ok(()) }} }