Collection of formatting & other minor improvements (oberblastmeister#25)

* run rustfmt

* box AhoCoresick structs when in enums with small variants

* prefer `impl From<>` to `impl Into<>`

* remove unnecessary lifetime parameter

* remove unnecessary clone()

* put format! macro into a closure for faster successful test running

* remove unnecessary refs and consuming iterators

* add allow(clippy) annotation & comment due to false positive

* merge imports from same source

Author: novedevo

src/app/command/empty.rs

@@ -25,7 +25,6 @@ pub struct Args {
     /// This can be useful in scripts.
     #[clap(short, long)]
     force: bool,
-
 }
 
 impl Args {

src/app/command/list.rs

@@ -26,7 +26,7 @@ pub struct Args {
 impl Args {
     pub fn run(&self, config_args: &app::ConfigArgs) -> Result<()> {
         let items = self.query_args.list(false)?;
-        display_items((&items).into_iter(), config_args)?;
+        display_items(items.iter(), config_args)?;
         Ok(())
     }
 }
@@ -93,7 +93,7 @@ impl QueryArgs {
             }
             new_items.extend(
                 items[range.to_std()]
-                    .into_iter()
+                    .iter()
                     .map(utils::clone_trash_item)
                     .zip(range.into_iter())
                     .map(swap),
@@ -150,8 +150,10 @@ pub fn indexed_items_to_table<'a>(
     base: &Path,
 ) -> Result<Table> {
     let mut failed = 0;
+    //this isn't actually needless since we need to reverse the items, which can't be done with a single-ended iterator
+    #[allow(clippy::needless_collect)]
     let items: Vec<_> = items
-        .filter_map(|(i, item)| match display_item(&item, use_color, base) {
+        .filter_map(|(i, item)| match display_item(item, use_color, base) {
             Ok(s) => Some((i, s)),
             Err(_) => {
                 failed += 1;
@@ -180,8 +182,7 @@ pub fn indexed_items_to_table<'a>(
 }
 
 pub fn display_item(item: &TrashItem, color: bool, base: &Path) -> Result<(String, String)> {
-    let mut displayed_path =
-        utils::path::display(&item.original_path().strip_prefix(base).unwrap());
+    let mut displayed_path = utils::path::display(item.original_path().strip_prefix(base).unwrap());
     if cfg!(target_os = "linux") && color {
         if let Some(style) = item_lscolors(item)? {
             let ansi_style = style.to_ansi_term_style();

src/app/command/restore.rs

@@ -58,7 +58,7 @@ fn restore_with_prompt(items: MaybeIndexedTrashItems, config_args: &app::ConfigA
     Ok(())
 }
 
-fn restore<'a>(items: MaybeIndexedTrashItems) -> Result<()> {
+fn restore(items: MaybeIndexedTrashItems) -> Result<()> {
     trash::os_limited::restore_all(items.items())?;
     Ok(())
 }

src/filter.rs

@@ -67,7 +67,7 @@ impl FilterArgs {
         let within = parse_time(self.within.as_deref())?;
         let patterns = match self.r#match {
             Match::Regex => Patterns::Regex(RegexSet::new(&self.patterns)?),
-            Match::Substring => Patterns::Substring(AhoCorasick::new(&self.patterns)),
+            Match::Substring => Patterns::Substring(Box::new(AhoCorasick::new(&self.patterns))),
             Match::Glob => Patterns::Glob(new_globset(self.patterns.iter().map(|s| &**s))?),
             Match::Exact => Patterns::Exact(self.patterns.iter().cloned().collect()),
         };
@@ -134,7 +134,7 @@ impl TimeFilter {
 
 pub enum Patterns {
     Regex(RegexSet),
-    Substring(AhoCorasick),
+    Substring(Box<AhoCorasick>),
     Glob(GlobSet),
     Exact(HashSet<String>),
 }

src/range_set.rs

@@ -19,9 +19,9 @@ impl From<Vec<Range>> for RangeSet {
     }
 }
 
-impl Into<Vec<Range>> for RangeSet {
-    fn into(self) -> Vec<Range> {
-        self.ranges
+impl From<RangeSet> for Vec<Range> {
+    fn from(range_set: RangeSet) -> Self {
+        range_set.ranges
     }
 }
 

src/range_syntax.rs

@@ -38,7 +38,8 @@ mod tests {
 
     fn parse_succeed<const N: usize>(s: &str, expect: [ops::Range<u32>; N]) {
         assert_eq!(
-            parse_range_set(s).expect(&format!("Failed to parse str `{}` into a restore index", s)),
+            parse_range_set(s)
+                .unwrap_or_else(|_| panic!("Failed to parse str `{}` into a restore index", s)),
             expect.into_iter().map(Into::into).collect()
         );
     }

src/table.rs

@@ -7,10 +7,7 @@ use prettytable::{cell, row, Cell, Row, Table};
 use terminal_size::{terminal_size, Width};
 
 use crate::border::Border;
-use crate::utils::{
-    get_metadata, Pair,
-};
-use crate::utils::{date, path};
+use crate::utils::{date, get_metadata, path, Pair};
 
 pub struct SizedTable {
     opt: Opt,

src/utils.rs

@@ -71,7 +71,7 @@ pub fn clone_trash_item(item: &TrashItem) -> TrashItem {
         id: item.id.clone(),
         name: item.name.clone(),
         original_parent: item.original_parent.clone(),
-        time_deleted: item.time_deleted.clone(),
+        time_deleted: item.time_deleted,
     }
 }