From dfa574375bc6cd1642eb8d519d2d9135da31ebc8 Mon Sep 17 00:00:00 2001
From: "andy.boot" <bootandy@gmail.com>
Date: Wed, 4 Aug 2021 18:04:02 +0100
Subject: [PATCH] clippy: Fix clippy lints

New rustup adds more lints
---
 src/dir_walker.rs   |  2 +-
 src/display.rs      |  8 ++++----
 src/display_node.rs | 11 ++++++-----
 src/platform.rs     |  4 ++--
 src/utils.rs        |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/dir_walker.rs b/src/dir_walker.rs
index 572bdb2..7b6ba08 100644
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -102,7 +102,7 @@ fn walk(dir: PathBuf, permissions_flag: &AtomicBool, walk_data: &WalkData) -> Op
 
                     // return walk(entry.path(), permissions_flag, ignore_directories, allowed_filesystems, use_apparent_size, by_filecount, ignore_hidden);
 
-                    if !ignore_file(&entry, walk_data) {
+                    if !ignore_file(entry, walk_data) {
                         if let Ok(data) = entry.file_type() {
                             if data.is_dir() && !data.is_symlink() {
                                 return walk(entry.path(), permissions_flag, walk_data);
diff --git a/src/display.rs b/src/display.rs
index 6ab2274..5477212 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -265,9 +265,9 @@ fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &Display
 
     // Add spaces after the filename so we can draw the % used bar chart.
     let name_and_padding = name
-        + &(repeat(" ")
-            .take(display_data.longest_string_length - width)
-            .collect::<String>());
+        + " "
+            .repeat(display_data.longest_string_length - width)
+            .as_str();
 
     maybe_trim_filename(name_and_padding, display_data)
 }
@@ -320,7 +320,7 @@ fn get_pretty_size(node: &DisplayNode, is_biggest: bool, display_data: &DisplayD
         let size_as_str = node.size.separate_with_commas();
         let spaces_to_add =
             display_data.num_chars_needed_on_left_most - size_as_str.chars().count();
-        size_as_str + &*repeat(' ').take(spaces_to_add).collect::<String>()
+        size_as_str + " ".repeat(spaces_to_add).as_str()
     } else {
         format!("{:>5}", human_readable_number(node.size))
     };
diff --git a/src/display_node.rs b/src/display_node.rs
index 6ae559f..d26b074 100644
--- a/src/display_node.rs
+++ b/src/display_node.rs
@@ -36,11 +36,12 @@ impl DisplayNode {
     }
 
     pub fn get_children_from_node(&self, is_reversed: bool) -> impl Iterator<Item = DisplayNode> {
-        if is_reversed {
-            let children: Vec<DisplayNode> = self.children.clone().into_iter().rev().collect();
-            children.into_iter()
+        // we box to avoid the clippy lint warning
+        let out: Box<dyn Iterator<Item = DisplayNode>> = if is_reversed {
+            Box::new(self.children.clone().into_iter().rev())
         } else {
-            self.children.clone().into_iter()
-        }
+            Box::new(self.children.clone().into_iter())
+        };
+        out
     }
 }
diff --git a/src/platform.rs b/src/platform.rs
index 82bfca6..c8b7525 100644
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -120,9 +120,9 @@ pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(
             {
                 Some((md.len(), None))
             } else {
-                get_metadata_expensive(&d)
+                get_metadata_expensive(d)
             }
         }
-        _ => get_metadata_expensive(&d),
+        _ => get_metadata_expensive(d),
     }
 }
diff --git a/src/utils.rs b/src/utils.rs
index 35f7098..44052d1 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -41,7 +41,7 @@ pub fn get_filesystem_devices<'a, P: IntoIterator<Item = &'a PathBuf>>(paths: P)
     paths
         .into_iter()
         .filter_map(|p| {
-            let meta = get_metadata(&p, false);
+            let meta = get_metadata(p, false);
 
             if let Some((_size, Some((_id, dev)))) = meta {
                 Some(dev)