Updated dependencies and used cargo clippy suggestions

Author: willdoescode

Cargo.lock

@@ -9,12 +9,12 @@ edition = "2018"
 
 [dependencies]
 chrono = "0.4.19"
-filetime = "0.2.13"
-humansize = "1.1.0"
-libc = "0.2.80"
+filetime = "0.2.14"
+humansize = "1.1.1"
+libc = "0.2.95"
 pretty-bytes = "0.2.2"
-structopt = "0.3.20"
-termion = "1.5.5"
+structopt = "0.3.21"
+termion = "1.5.6"
 users = "0.11.0"
 
 

Cargo.toml

@@ -1,9 +1,11 @@
 #![allow(dead_code)]
+#![allow(clippy::unit_arg)]
 
 mod input;
 mod text_effects;
 mod utils;
 use std::os::unix::fs::{FileTypeExt, MetadataExt};
+use std::path::Path;
 use structopt::StructOpt;
 use std::cmp::Ordering;
 
@@ -44,7 +46,7 @@ enum PathType {
 }
 
 impl PathType {
-  fn new(file: &std::path::PathBuf) -> Result<Vec<Self>, Box<dyn std::error::Error>> {
+  fn new(file: &Path) -> Result<Vec<Self>, Box<dyn std::error::Error>> {
     let mut return_val = Vec::new();
     if file.symlink_metadata()?.is_dir() {return_val.push(Self::Dir) }
     if file.symlink_metadata()?.file_type().is_symlink() {return_val.push(Self::Symlink)}
@@ -91,7 +93,7 @@ impl PathType {
     }
   }
 
-  fn get_text_traits_for_type(&self, name: &str, file: &std::path::PathBuf) -> String {
+  fn get_text_traits_for_type(&self, name: &str, file: &Path) -> String {
     match self {
       Self::Dir     => text_effects::bold(&format!( "{}{}/", name, termion::color::Fg(termion::color::White))),
       Self::Symlink => text_effects::italic(&format!( "{} -> {}", name, std::fs::read_link(file).unwrap().display().to_string())),
@@ -229,7 +231,7 @@ impl Directory {
             .to_lowercase()
           )
       }),
-      DirSortType::Created  => sort_as(&mut self.paths ,|a, b| {
+      DirSortType::Created  => sort_as(&mut self.paths, |a, b| {
         a.path
           .symlink_metadata()
           .unwrap()
@@ -242,7 +244,7 @@ impl Directory {
             .unwrap()
           )
       }),
-      DirSortType::Modified => sort_as(&mut self.paths, |a, b| {
+      DirSortType::Modified => sort_as(&mut self.paths,  |a, b| {
         a.path
           .symlink_metadata()
           .unwrap()
@@ -255,7 +257,7 @@ impl Directory {
             .unwrap()
           )
       }),
-      DirSortType::Size => sort_as(&mut self.paths, |a, b| {
+      DirSortType::Size => sort_as(&mut self.paths,  |a, b| {
         a.path
           .symlink_metadata()
           .unwrap()
@@ -270,7 +272,6 @@ impl Directory {
     }
   }
 
-
   fn sort(&mut self) {
     match self.args.gdf {
       true  => self.sort_directory_then_path(),
@@ -419,14 +420,13 @@ impl std::fmt::Debug for File {
           &self.path
         );
         res = format!("{}{}", v.get_color_for_type(), res);
-      } else {
-        res = v.get_text_traits_for_type(&res, &self.path);
-        res = format!("{}{}", v.get_color_for_type(), res);
+        continue;
       }
+      res = v.get_text_traits_for_type(&res, &self.path);
+      res = format!("{}{}", v.get_color_for_type(), res);
     }
 
-	  let time = if input::Cli::from_args().created_time { &self.created }
-    else { &self.modified };
+	  let time = if input::Cli::from_args().created_time { &self.created } else { &self.modified };
 
     writeln!(f, "{} {green}{} {yellow}{} {blue} {}{} {}",
       self.perms, self.size, self.user, self.group, time, res,

src/main.rs

@@ -2,17 +2,17 @@ use std::os::unix::fs::MetadataExt;
 
 pub fn group(path: std::path::PathBuf) -> String {
   let group = users::get_group_by_gid(path.symlink_metadata().unwrap().gid());
-    if  group.is_some() {
-      String::from(group.unwrap().name().to_string_lossy())
+    if  let Some(g) = group {
+      String::from(g.name().to_string_lossy())
     } else {
       String::from(" ")
     }
 }
 
 pub fn user(path: std::path::PathBuf) -> String {
   let user = users::get_user_by_uid(path.symlink_metadata().unwrap().uid());
-  if user.is_some(){
-    String::from(user.unwrap().name().to_string_lossy())
+  if let Some(u) = user {
+    String::from(u.name().to_string_lossy())
   } else {
     String::from(" ")
   }

src/utils/group_user.rs

@@ -69,5 +69,4 @@ fn masking(mode: u16, read: u16, write: u16, execute: u16) -> String {
       termion::color::Fg(termion::color::Reset)
     ),
   }
-  .to_string()
 }