refactor: clippy lints

Signed-off-by: Christina Sørensen <ces@fem.gg>

Author: cafkafk

benches/my_benchmark.rs

@@ -9,8 +9,8 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("logger", |b| {
         b.iter(|| {
-            eza::logger::configure(black_box(std::env::var_os(eza::options::vars::EZA_DEBUG)))
-        })
+            eza::logger::configure(black_box(std::env::var_os(eza::options::vars::EZA_DEBUG)));
+        });
     });
 }
 

build.rs

@@ -9,12 +9,12 @@
 /// just the version for *release* versions so the builds are reproducible.
 ///
 /// This script generates the string from the environment variables that Cargo
-/// adds (http://doc.crates.io/environment-variables.html) and runs `git` to
+/// adds (<http://doc.crates.io/environment-variables.html>) and runs `git` to
 /// get the SHA1 hash. It then writes the string into a file, which exa then
 /// includes at build-time.
 ///
-/// - https://stackoverflow.com/q/43753491/3484614
-/// - https://crates.io/crates/vergen
+/// - <https://stackoverflow.com/q/43753491/3484614>
+/// - <https://crates.io/crates/vergen>
 use std::env;
 use std::fs::File;
 use std::io::{self, Write};
@@ -116,7 +116,7 @@ fn version_string() -> String {
 
 /// Finds whether a feature is enabled by examining the Cargo variable.
 fn feature_enabled(name: &str) -> bool {
-    env::var(format!("CARGO_FEATURE_{}", name))
+    env::var(format!("CARGO_FEATURE_{name}"))
         .map(|e| !e.is_empty())
         .unwrap_or(false)
 }

src/fs/dir.rs

@@ -12,7 +12,7 @@ use std::io;
 use std::path::{Path, PathBuf};
 use std::slice::Iter as SliceIter;
 
-use log::*;
+use log::info;
 
 use crate::fs::File;
 
@@ -50,7 +50,7 @@ impl Dir {
 
     /// Produce an iterator of IO results of trying to read all the files in
     /// this directory.
-    pub fn files<'dir, 'ig>(
+    #[must_use] pub fn files<'dir, 'ig>(
         &'dir self,
         dots: DotFilter,
         git: Option<&'ig GitCache>,
@@ -71,12 +71,12 @@ impl Dir {
     }
 
     /// Whether this directory contains a file with the given path.
-    pub fn contains(&self, path: &Path) -> bool {
+    #[must_use] pub fn contains(&self, path: &Path) -> bool {
         self.contents.iter().any(|p| p.path().as_path() == path)
     }
 
     /// Append a path onto the path specified by this directory.
-    pub fn join(&self, child: &Path) -> PathBuf {
+    #[must_use] pub fn join(&self, child: &Path) -> PathBuf {
         self.path.join(child)
     }
 }

src/fs/dir_action.rs

@@ -43,15 +43,15 @@ pub enum DirAction {
 
 impl DirAction {
     /// Gets the recurse options, if this dir action has any.
-    pub fn recurse_options(self) -> Option<RecurseOptions> {
+    #[must_use] pub fn recurse_options(self) -> Option<RecurseOptions> {
         match self {
             Self::Recurse(o) => Some(o),
             _ => None,
         }
     }
 
     /// Whether to treat directories as regular files or not.
-    pub fn treat_dirs_as_files(self) -> bool {
+    #[must_use] pub fn treat_dirs_as_files(self) -> bool {
         match self {
             Self::AsFile => true,
             Self::Recurse(o) => o.tree,
@@ -74,7 +74,7 @@ pub struct RecurseOptions {
 
 impl RecurseOptions {
     /// Returns whether a directory of the given depth would be too deep.
-    pub fn is_too_deep(self, depth: usize) -> bool {
+    #[must_use] pub fn is_too_deep(self, depth: usize) -> bool {
         match self.max_depth {
             None => false,
             Some(d) => d <= depth,

src/fs/feature/git.rs

@@ -14,7 +14,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Mutex;
 
 use git2::StatusEntry;
-use log::*;
+use log::{debug, error, info, warn};
 
 use crate::fs::fields as f;
 
@@ -31,11 +31,11 @@ pub struct GitCache {
 }
 
 impl GitCache {
-    pub fn has_anything_for(&self, index: &Path) -> bool {
+    #[must_use] pub fn has_anything_for(&self, index: &Path) -> bool {
         self.repos.iter().any(|e| e.has_path(index))
     }
 
-    pub fn get(&self, index: &Path, prefix_lookup: bool) -> f::Git {
+    #[must_use] pub fn get(&self, index: &Path, prefix_lookup: bool) -> f::Git {
         self.repos
             .iter()
             .find(|repo| repo.has_path(index))
@@ -410,7 +410,7 @@ fn current_branch(repo: &git2::Repository) -> Option<String> {
 }
 
 impl f::SubdirGitRepo {
-    pub fn from_path(dir: &Path, status: bool) -> Self {
+    #[must_use] pub fn from_path(dir: &Path, status: bool) -> Self {
         let path = &reorient(dir);
 
         if let Ok(repo) = git2::Repository::open(path) {

src/fs/fields.rs

@@ -62,7 +62,7 @@ pub enum Type {
 }
 
 impl Type {
-    pub fn is_regular_file(self) -> bool {
+    #[must_use] pub fn is_regular_file(self) -> bool {
         matches!(self, Self::File)
     }
 }

src/fs/file.rs

@@ -24,7 +24,7 @@ use std::time::SystemTime;
 
 use chrono::prelude::*;
 
-use log::*;
+use log::{debug, error, trace};
 #[cfg(unix)]
 use std::sync::LazyLock;
 
@@ -209,18 +209,18 @@ impl<'dir> File<'dir> {
         file
     }
 
-    pub fn new_aa_current(parent_dir: &'dir Dir, total_size: bool) -> File<'dir> {
+    #[must_use] pub fn new_aa_current(parent_dir: &'dir Dir, total_size: bool) -> File<'dir> {
         File::new_aa(parent_dir.path.clone(), parent_dir, ".", total_size)
     }
 
-    pub fn new_aa_parent(path: PathBuf, parent_dir: &'dir Dir, total_size: bool) -> File<'dir> {
+    #[must_use] pub fn new_aa_parent(path: PathBuf, parent_dir: &'dir Dir, total_size: bool) -> File<'dir> {
         File::new_aa(path, parent_dir, "..", total_size)
     }
 
     /// A file’s name is derived from its string. This needs to handle directories
     /// such as `/` or `..`, which have no `file_name` component. So instead, just
     /// use the last component as the name.
-    pub fn filename(path: &Path) -> String {
+    #[must_use] pub fn filename(path: &Path) -> String {
         if let Some(back) = path.components().next_back() {
             back.as_os_str().to_string_lossy().to_string()
         } else {
@@ -1016,7 +1016,7 @@ pub enum FileTarget<'dir> {
 impl<'dir> FileTarget<'dir> {
     /// Whether this link doesn’t lead to a file, for whatever reason. This
     /// gets used to determine how to highlight the link in grid views.
-    pub fn is_broken(&self) -> bool {
+    #[must_use] pub fn is_broken(&self) -> bool {
         matches!(self, Self::Broken(_) | Self::Err(_))
     }
 }

src/fs/filter.rs

@@ -365,7 +365,7 @@ impl IgnorePatterns {
     }
 
     /// Create a new empty set of patterns that matches nothing.
-    pub fn empty() -> Self {
+    #[must_use] pub fn empty() -> Self {
         Self {
             patterns: Vec::new(),
         }

src/fs/recursive_size.rs

@@ -37,7 +37,7 @@ impl RecursiveSize {
     /// assert_eq!(x.is_none(), false);
     /// ```
     #[inline]
-    pub const fn is_none(&self) -> bool {
+    #[must_use] pub const fn is_none(&self) -> bool {
         matches!(*self, Self::None)
     }
 
@@ -53,7 +53,7 @@ impl RecursiveSize {
     /// assert_eq!(RecursiveSize::Some(2, 3).unwrap_bytes_or(1), 2);
     /// ```
     #[inline]
-    pub const fn unwrap_bytes_or(self, default: u64) -> u64 {
+    #[must_use] pub const fn unwrap_bytes_or(self, default: u64) -> u64 {
         match self {
             Self::Some(bytes, _blocks) => bytes,
             _ => default,

src/options/config.rs

@@ -5,7 +5,7 @@
 // SPDX-FileCopyrightText: 2014 Benjamin Sago
 // SPDX-License-Identifier: MIT
 use crate::theme::ThemeFileType as FileType;
-use crate::theme::*;
+use crate::theme::{FileKinds, FileNameStyle, Git, GitRepo, IconStyle, Links, Permissions, SELinuxContext, SecurityContext, Size, UiStyles, Users};
 use nu_ansi_term::{Color, Style};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_norway;
@@ -49,7 +49,7 @@ where
 
 #[rustfmt::skip]
 fn color_from_str(s: &str) -> Option<Color> {
-    use Color::*;
+    use Color::{Black, Blue, Cyan, DarkGray, Default, Fixed, Green, LightBlue, LightCyan, LightGray, LightGreen, LightMagenta, LightPurple, LightRed, LightYellow, Magenta, Purple, Red, Rgb, White, Yellow};
     match s {
         // nothing
         "" | "none"    | "None"         => None,
@@ -604,10 +604,10 @@ impl FromOverride<UiStylesOverride> for UiStyles {
     }
 }
 impl ThemeConfig {
-    pub fn from_path(path: PathBuf) -> Self {
+    #[must_use] pub fn from_path(path: PathBuf) -> Self {
         ThemeConfig { location: path }
     }
-    pub fn to_theme(&self) -> Option<UiStyles> {
+    #[must_use] pub fn to_theme(&self) -> Option<UiStyles> {
         let ui_styles_override: Option<UiStylesOverride> = {
             let file = std::fs::File::open(&self.location).ok()?;
             serde_norway::from_reader(&file).ok()
@@ -650,7 +650,7 @@ mod tests {
 
     #[test]
     fn parse_short_hex_color_from_string() {
-        for case in ["#f0f", "#F0F"].iter() {
+        for case in &["#f0f", "#F0F"] {
             assert_eq!(color_from_str(case), Some(Color::Rgb(255, 0, 255)));
         }
     }