From 9d3cb699354804b3ea76c972d021474ea934fca5 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Tue, 19 May 2020 15:37:17 +0200
Subject: [PATCH] Minor refactoring

---
 src/main.rs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 9d0d437..09c205c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -79,33 +79,32 @@ fn run() -> Result<ExitCode> {
         .values_of_os("path")
         .or_else(|| matches.values_of_os("search-path"));
 
-    // Assign current directory to search vector.
-    let mut dir_vec: Vec<_> = vec![current_directory.to_path_buf()];
-
-    // Assign any valid arguments to search vector.
-    if let Some(paths) = passed_arguments {
-        dir_vec = vec![];
+    let mut search_paths = if let Some(paths) = passed_arguments {
+        let mut directories = vec![];
         for path in paths {
             let path_buffer = PathBuf::from(path);
             if filesystem::is_dir(&path_buffer) {
-                dir_vec.push(path_buffer);
-            }
-            else {
+                directories.push(path_buffer);
+            } else {
                 print_error(format!(
                     "Search path '{}' is not a directory.",
                     path_buffer.to_string_lossy()
                 ));
             }
         }
-    }
+
+        directories
+    } else {
+        vec![current_directory.to_path_buf()]
+    };
 
     // Check if we have no valid search paths.
-    if dir_vec.is_empty() {
+    if search_paths.is_empty() {
         return Err(anyhow!("No valid search paths given."));
     }
 
     if matches.is_present("absolute-path") {
-        dir_vec = dir_vec
+        search_paths = search_paths
             .iter()
             .map(|path_buffer| {
                 path_buffer
@@ -410,7 +409,7 @@ fn run() -> Result<ExitCode> {
             )
         })?;
 
-    walk::scan(&dir_vec, Arc::new(re), Arc::new(config))
+    walk::scan(&search_paths, Arc::new(re), Arc::new(config))
 }
 
 fn main() {