cargo clippy

9 files changed, 57 insertions, 58 deletions

diff --git a/src/commands/bookmark.rs b/src/commands/bookmark.rs
index 6c13752..23db860 100644
--- a/src/commands/bookmark.rs
+++ b/src/commands/bookmark.rs
@@ -1,5 +1,6 @@
 use std::fs::File;
 use std::io::Write;
+use std::path;
 
 use termion::event::Event;
 use tui::layout::Rect;
@@ -19,19 +20,21 @@ use crate::{BOOKMARKS_FILE, BOOKMARKS_T, CONFIG_HIERARCHY};
 
 use super::change_directory::change_directory;
 
+fn find_bookmark_file() -> Option<path::PathBuf> {
+    for p in CONFIG_HIERARCHY.iter() {
+        if p.exists() {
+            return Some(p.clone());
+        }
+    }
+    None
+}
+
 pub fn add_bookmark(context: &mut AppContext, backend: &mut AppBackend) -> JoshutoResult {
     let cwd = std::env::current_dir()?;
 
     let bookmark_path = match search_directories(BOOKMARKS_FILE, &CONFIG_HIERARCHY) {
         Some(file_path) => Some(file_path),
-        None => {
-            for p in CONFIG_HIERARCHY.iter() {
-                if p.exists() {
-                    Some(p.clone());
-                }
-            }
-            None
-        }
+        None => find_bookmark_file(),
     };
 
     if let Some(bookmark_path) = bookmark_path {
@@ -81,7 +84,7 @@ pub fn change_directory_bookmark(
     Ok(())
 }
 
-fn poll_for_bookmark_key<'a>(context: &mut AppContext, backend: &mut AppBackend) -> Option<Event> {
+fn poll_for_bookmark_key(context: &mut AppContext, backend: &mut AppBackend) -> Option<Event> {
     context.flush_event();
 
     let mut bookmarks: Vec<String> = BOOKMARKS_T
diff --git a/src/commands/file_ops.rs b/src/commands/file_ops.rs
index dd16264..7107301 100644
--- a/src/commands/file_ops.rs
+++ b/src/commands/file_ops.rs
@@ -138,7 +138,7 @@ fn copy_string_to_buffer(string: String) -> JoshutoResult {
     ];
 
     for (_, command) in clipboards.iter() {
-        match Command::new("sh").args(&["-c", command.as_str()]).status() {
+        match Command::new("sh").args(["-c", command.as_str()]).status() {
             Ok(s) if s.success() => return Ok(()),
             _ => {}
         }
diff --git a/src/commands/rename_file.rs b/src/commands/rename_file.rs
index dee8cde..6ef6cd5 100644
--- a/src/commands/rename_file.rs
+++ b/src/commands/rename_file.rs
@@ -18,7 +18,7 @@ pub fn _rename_file(
         let err = std::io::Error::new(std::io::ErrorKind::AlreadyExists, "Filename already exists");
         return Err(err);
     }
-    std::fs::rename(&src, &dest)?;
+    std::fs::rename(src, dest)?;
 
     let curr_tab = context.tab_context_ref().curr_tab_ref();
 
diff --git a/src/config/bookmarks/bookmarks.rs b/src/config/bookmarks/bookmarks.rs
deleted file mode 100644
index a1d03a8..0000000
--- a/src/config/bookmarks/bookmarks.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::collections::HashMap;
-
-use termion::event::Event;
-
-use crate::config::{parse_to_config_file, TomlConfigFile};
-use crate::util::keyparse;
-
-use super::bookmarks_raw::BookmarksRaw;
-
-pub type Bookmarks = HashMap<Event, String>;
-
-impl From<BookmarksRaw> for Bookmarks {
-    fn from(raw: BookmarksRaw) -> Self {
-        let mut raw = raw;
-        let map: Bookmarks = raw
-            .bookmark
-            .drain(..)
-            .filter_map(|bookmark| match keyparse::str_to_event(&bookmark.key) {
-                Some(event) => Some((event, bookmark.path)),
-                None => None,
-            })
-            .collect();
-        map
-    }
-}
-
-impl TomlConfigFile for Bookmarks {
-    fn get_config(file_name: &str) -> Self {
-        match parse_to_config_file::<BookmarksRaw, Bookmarks>(file_name) {
-            Ok(s) => s,
-            Err(e) => {
-                eprintln!("Failed to parse app config: {}", e);
-                Self::default()
-            }
-        }
-    }
-}
diff --git a/src/config/bookmarks/mod.rs b/src/config/bookmarks/mod.rs
index 050ac70..50b0757 100644
--- a/src/config/bookmarks/mod.rs
+++ b/src/config/bookmarks/mod.rs
@@ -1,5 +1,39 @@
-pub mod bookmarks;
 pub mod bookmarks_raw;
 
-pub use self::bookmarks::*;
 pub use self::bookmarks_raw::*;
+
+use std::collections::HashMap;
+
+use termion::event::Event;
+
+use crate::config::{parse_to_config_file, TomlConfigFile};
+use crate::util::keyparse;
+
+pub type Bookmarks = HashMap<Event, String>;
+
+impl From<BookmarksRaw> for Bookmarks {
+    fn from(raw: BookmarksRaw) -> Self {
+        let mut raw = raw;
+        let map: Bookmarks = raw
+            .bookmark
+            .drain(..)
+            .filter_map(|bookmark| match keyparse::str_to_event(&bookmark.key) {
+                Some(event) => Some((event, bookmark.path)),
+                None => None,
+            })
+            .collect();
+        map
+    }
+}
+
+impl TomlConfigFile for Bookmarks {
+    fn get_config(file_name: &str) -> Self {
+        match parse_to_config_file::<BookmarksRaw, Bookmarks>(file_name) {
+            Ok(s) => s,
+            Err(e) => {
+                eprintln!("Failed to parse app config: {}", e);
+                Self::default()
+            }
+        }
+    }
+}
diff --git a/src/config/general/display_raw.rs b/src/config/general/display_raw.rs
index b6b8a89..295d30f 100644
--- a/src/config/general/display_raw.rs
+++ b/src/config/general/display_raw.rs
@@ -106,7 +106,7 @@ impl From<DisplayOptionRaw> for DisplayOption {
         ];
 
         let _line_nums = LineNumberStyle::from_str(raw.line_number_style.as_str())
-            .unwrap_or_else(|| LineNumberStyle::None);
+            .unwrap_or(LineNumberStyle::None);
 
         Self {
             _mode: mode,
diff --git a/src/config/general/tab_raw.rs b/src/config/general/tab_raw.rs
index 9053a7c..a6c4240 100644
--- a/src/config/general/tab_raw.rs
+++ b/src/config/general/tab_raw.rs
@@ -25,8 +25,7 @@ impl std::default::Default for TabOptionRaw {
 
 impl From<TabOptionRaw> for TabOption {
     fn from(raw: TabOptionRaw) -> Self {
-        let home_page =
-            TabHomePage::from_str(raw.home_page.as_str()).unwrap_or_else(|| TabHomePage::Home);
+        let home_page = TabHomePage::from_str(raw.home_page.as_str()).unwrap_or(TabHomePage::Home);
 
         Self::new(home_page)
     }
diff --git a/src/config/option/sort_type.rs b/src/config/option/sort_type.rs
index e8f5d29..8987ad5 100644
--- a/src/config/option/sort_type.rs
+++ b/src/config/option/sort_type.rs
@@ -124,7 +124,7 @@ fn size_sort(file1: &JoshutoDirEntry, file2: &JoshutoDirEntry) -> cmp::Ordering
 fn ext_sort(file1: &JoshutoDirEntry, file2: &JoshutoDirEntry) -> cmp::Ordering {
     let f1_ext = file1.get_ext();
     let f2_ext = file2.get_ext();
-    alphanumeric_sort::compare_str(&f1_ext, &f2_ext)
+    alphanumeric_sort::compare_str(f1_ext, f2_ext)
 }
 
 fn lexical_sort(
@@ -151,10 +151,10 @@ fn natural_sort(
     let f1_name = f1.file_name();
     let f2_name = f2.file_name();
     if sort_option.case_sensitive {
-        alphanumeric_sort::compare_str(&f1_name, &f2_name)
+        alphanumeric_sort::compare_str(f1_name, f2_name)
     } else {
         let f1_name = f1_name.to_lowercase();
         let f2_name = f2_name.to_lowercase();
-        alphanumeric_sort::compare_str(&f1_name, &f2_name)
+        alphanumeric_sort::compare_str(f1_name, f2_name)
     }
 }
diff --git a/src/io/io_worker.rs b/src/io/io_worker.rs
index 54385ec..6ed7b9f 100644
--- a/src/io/io_worker.rs
+++ b/src/io/io_worker.rs
@@ -339,9 +339,9 @@ where
     for path in paths {
         if let Ok(metadata) = fs::symlink_metadata(path) {
             if metadata.is_dir() {
-                fs::remove_dir_all(&path)?;
+                fs::remove_dir_all(path)?;
             } else {
-                fs::remove_file(&path)?;
+                fs::remove_file(path)?;
             }
         }
     }