Merge branch 'master' into custom_error_type

nrc · Jul 8, 2021 · 9879f56 · 9879f56
2 parents c6ca804 + 3f6df1d
commit 9879f56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/header.rs b/src/header.rs
@@ -227,7 +227,7 @@ pub enum Class {
 
 impl Class {
     pub fn is_none(&self) -> bool {
-        if let Class::None = *self { true } else { false }
+        matches!(*self, Class::None)
     }
 }
 
@@ -265,7 +265,7 @@ pub enum Data {
 
 impl Data {
     pub fn is_none(&self) -> bool {
-        if let Data::None = *self { true } else { false }
+        matches!(*self, Data::None)
     }
 }
 
@@ -301,11 +301,7 @@ pub enum Version {
 
 impl Version {
     pub fn is_none(&self) -> bool {
-        if let Version::None = *self {
-            true
-        } else {
-            false
-        }
+        matches!(*self, Version::None)
     }
 }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -45,11 +45,7 @@ pub struct ElfFile<'a> {
 
 impl<'a> ElfFile<'a> {
     pub fn new(input: &'a [u8]) -> Result<ElfFile<'a>, Error> {
-        let header = header::parse_header(input)?;
-        Ok(ElfFile {
-            input,
-            header,
-        })
+        header::parse_header(input).map(|header| ElfFile {input, header})
     }
 
     pub fn section_header(&self, index: u16) -> Result<SectionHeader<'a>, Error> {