Merge pull request #381 from wcampbell0x2a/fix-clippy-unnecessary_fallible_conversions

Fix clippy::unnecessary_fallible_conversions

Author: wcampbell0x2a

backhand-cli/src/bin/unsquashfs.rs

@@ -31,7 +31,7 @@ use std::time::{Duration, Instant};
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 pub fn required_root(a: &str) -> Result<PathBuf, String> {
-    let p = PathBuf::try_from(a).or(Err("could not".to_string()))?;
+    let p = PathBuf::from(a);
 
     if p.has_root() {
         Ok(p)
@@ -560,7 +560,7 @@ fn extract_all<'a, S: ParallelIterator<Item = &'a Node<SquashfsFileReader>>>(
                         &filepath,
                         SFlag::S_IFCHR,
                         Mode::from_bits(mode_t::from(node.header.permissions)).unwrap(),
-                        dev_t::try_from(*device_number).unwrap(),
+                        dev_t::from(*device_number),
                     ) {
                         Ok(_) => {
                             if args.info && !args.quiet {
@@ -602,7 +602,7 @@ fn extract_all<'a, S: ParallelIterator<Item = &'a Node<SquashfsFileReader>>>(
                     &filepath,
                     SFlag::S_IFBLK,
                     Mode::from_bits(mode_t::from(node.header.permissions)).unwrap(),
-                    dev_t::try_from(*device_number).unwrap(),
+                    dev_t::from(*device_number),
                 ) {
                     Ok(_) => {
                         if args.info && !args.quiet {

backhand/src/filesystem/writer.rs

@@ -685,7 +685,7 @@ impl<'a, 'b, 'c> FilesystemWriter<'a, 'b, 'c> {
 
             // Write 1K at a time
             let mut total_written = 0;
-            while w.stream_position()? < (superblock.bytes_used + u64::try_from(pad_len).unwrap()) {
+            while w.stream_position()? < (superblock.bytes_used + u64::from(pad_len)) {
                 let arr = &[0x00; 1024];
 
                 // check if last block to write
@@ -720,7 +720,7 @@ impl<'a, 'b, 'c> FilesystemWriter<'a, 'b, 'c> {
 
         //clean any cache, make sure the output is on disk
         w.flush()?;
-        Ok(superblock.bytes_used + u64::try_from(pad_len).unwrap())
+        Ok(superblock.bytes_used + u64::from(pad_len))
     }
 
     /// For example, writing a fragment table:

backhand/src/squashfs.rs

@@ -496,15 +496,15 @@ impl<'b> Squashfs<'b> {
             InodeInner::BasicDirectory(basic_dir) => {
                 trace!("BASIC_DIR inodes: {:02x?}", basic_dir);
                 self.dir_from_index(
-                    basic_dir.block_index.try_into().unwrap(),
-                    basic_dir.file_size.try_into().unwrap(),
+                    u64::from(basic_dir.block_index),
+                    u32::from(basic_dir.file_size),
                     basic_dir.block_offset as usize,
                 )?
             }
             InodeInner::ExtendedDirectory(ext_dir) => {
                 trace!("EXT_DIR: {:#02x?}", ext_dir);
                 self.dir_from_index(
-                    ext_dir.block_index.try_into().unwrap(),
+                    u64::from(ext_dir.block_index),
                     ext_dir.file_size,
                     ext_dir.block_offset as usize,
                 )?