fix clippy hints

Author: flier

src/commands.rs

@@ -39,9 +39,9 @@ impl VersionTag {
     }
 }
 
-impl Into<u32> for VersionTag {
-    fn into(self) -> u32 {
-        self.0
+impl From<VersionTag> for u32 {
+    fn from(v: VersionTag) -> Self {
+        v.0
     }
 }
 
@@ -85,20 +85,20 @@ impl fmt::Display for VersionTag {
 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]
 pub struct SourceVersionTag(u64);
 
-impl Into<u64> for SourceVersionTag {
-    fn into(self) -> u64 {
-        self.0
+impl From<SourceVersionTag> for u64 {
+    fn from(v: SourceVersionTag) -> Self {
+        v.0
     }
 }
 
-impl Into<(u32, u32, u32, u32, u32)> for SourceVersionTag {
-    fn into(self) -> (u32, u32, u32, u32, u32) {
+impl From<SourceVersionTag> for (u32, u32, u32, u32, u32) {
+    fn from(v: SourceVersionTag) -> (u32, u32, u32, u32, u32) {
         (
-            ((self.0 >> 40) & 0xFFF) as u32,
-            ((self.0 >> 30) & 0x3FF) as u32,
-            ((self.0 >> 20) & 0x3FF) as u32,
-            ((self.0 >> 10) & 0x3FF) as u32,
-            (self.0 & 0x3FF) as u32,
+            ((v.0 >> 40) & 0xFFF) as u32,
+            ((v.0 >> 30) & 0x3FF) as u32,
+            ((v.0 >> 20) & 0x3FF) as u32,
+            ((v.0 >> 10) & 0x3FF) as u32,
+            (v.0 & 0x3FF) as u32,
         )
     }
 }
@@ -140,10 +140,9 @@ impl From<u32> for BuildTarget {
         }
     }
 }
-
-impl Into<u32> for BuildTarget {
-    fn into(self) -> u32 {
-        match self {
+impl From<BuildTarget> for u32 {
+    fn from(t: BuildTarget) -> u32 {
+        match t {
             BuildTarget::MacOsX => LC_VERSION_MIN_MACOSX,
             BuildTarget::IPhoneOs => LC_VERSION_MIN_IPHONEOS,
             BuildTarget::WatchOs => LC_VERSION_MIN_WATCHOS,
@@ -1439,7 +1438,9 @@ impl LoadCommand {
 
         if cmdsize < read {
             return Err(BufferOverflow(cmdsize));
-        } else if cmdsize > read {
+        }
+
+        if cmdsize > read {
             // skip the reserved or padding bytes
             buf.consume(cmdsize - read);
         }
@@ -1676,9 +1677,9 @@ impl SectionFlags {
     }
 }
 
-impl Into<u32> for SectionFlags {
-    fn into(self) -> u32 {
-        self.0
+impl From<SectionFlags> for u32 {
+    fn from(f: SectionFlags) -> u32 {
+        f.0
     }
 }
 

src/consts.rs

@@ -14,7 +14,7 @@ pub type off_t = u32;
 /// mask for architecture bits
 pub const CPU_ARCH_MASK: cpu_type_t = 0xff00_0000u32 as cpu_type_t;
 /// 64 bit ABI
-pub const CPU_ARCH_ABI64: cpu_type_t = 0x0100_0000 as cpu_type_t;
+pub const CPU_ARCH_ABI64: cpu_type_t = 0x0100_0000i32;
 
 //  Machine types known by all.
 //

src/export.rs

@@ -155,7 +155,7 @@ impl<'a> Iterator for ExportSymbols<'a> {
 
             if let Some((kind, ref symbol)) = node.symbol {
                 return Some(ExportSymbol {
-                    name: prefix.clone(),
+                    name: prefix,
                     kind,
                     symbol: symbol.clone(),
                 });

src/loader.rs

@@ -205,7 +205,7 @@ impl ArHeader {
 
         for c in s.as_bytes() {
             if *c < b'0' || b'7' < *c {
-                return Err(ParseOctalError(String::from(s)).into());
+                return Err(ParseOctalError(String::from(s)));
             }
 
             v = v * 8 + (c - b'0') as usize;
@@ -278,15 +278,15 @@ impl OFile {
                 buf.seek(SeekFrom::Current(-4))?;
 
                 if buf.get_ref().as_ref().len() < ar_magic.len() {
-                    return Err(UnknownMagic(magic).into());
+                    return Err(UnknownMagic(magic));
                 }
 
                 buf.read_exact(&mut ar_magic)?;
 
                 if ar_magic == ARMAG {
                     Self::parse_ar_file::<NativeEndian, T>(buf)
                 } else {
-                    Err(UnknownMagic(magic).into())
+                    Err(UnknownMagic(magic))
                 }
             }
         }
@@ -346,7 +346,7 @@ impl OFile {
 
         for arch in archs {
             if u64::from(arch.offset) < start {
-                return Err(BufferOverflow(arch.offset as usize).into());
+                return Err(BufferOverflow(arch.offset as usize));
             }
 
             let content = payload.checked_slice(arch.offset as usize, arch.size as usize)?;
@@ -374,10 +374,10 @@ impl OFile {
                     let mut end = buf
                         .position()
                         .checked_add(header.ar_size as u64)
-                        .ok_or_else(|| BufferOverflow(header.ar_size as usize))?;
+                        .ok_or(BufferOverflow(header.ar_size as usize))?;
 
                     if let Some(size) = header.extended_format_size() {
-                        end = end.checked_sub(size as u64).ok_or_else(|| BufferOverflow(size))?;
+                        end = end.checked_sub(size as u64).ok_or(BufferOverflow(size))?;
                     }
 
                     if header.name() == SYMDEF || header.name() == SYMDEF_SORTED {
@@ -436,12 +436,12 @@ pub trait CheckedSlice<T>: AsRef<[T]> {
     fn checked_slice(&self, off: usize, len: usize) -> Result<&[T]> {
         let s = self.as_ref();
         let start = off as usize;
-        let end = off.checked_add(len).ok_or_else(|| BufferOverflow(len))? as usize;
+        let end = off.checked_add(len).ok_or(BufferOverflow(len))? as usize;
 
         if start >= s.len() || start >= end {
-            Err(BufferOverflow(start).into())
+            Err(BufferOverflow(start))
         } else if end > s.len() {
-            Err(BufferOverflow(end).into())
+            Err(BufferOverflow(end))
         } else {
             Ok(&s[start..end])
         }