fmt

src/exec/job.rs

@@ -2,11 +2,11 @@ use std::path::PathBuf;
 use std::sync::mpsc::Receiver;
 use std::sync::{Arc, Mutex};
 
+use crate::config::Config;
 use crate::error::print_error;
 use crate::exit_codes::{merge_exitcodes, ExitCode};
-use crate::walk::WorkerResult;
 use crate::filesystem::strip_current_dir;
-use crate::config::Config;
+use crate::walk::WorkerResult;
 
 use super::CommandTemplate;
 
@@ -60,21 +60,23 @@ pub fn batch(
     buffer_output: bool,
     config: &Arc<Config>,
 ) -> ExitCode {
-    let paths = rx.iter().filter_map(|value| match value {
+    let paths = rx
-        WorkerResult::Entry(val) => Some(val),
+        .iter()
-        WorkerResult::Error(err) => {
+        .filter_map(|value| match value {
-            if show_filesystem_errors {
+            WorkerResult::Entry(val) => Some(val),
-                print_error(err.to_string());
+            WorkerResult::Error(err) => {
+                if show_filesystem_errors {
+                    print_error(err.to_string());
+                }
+                None
             }
-            None
+        })
-        }
+        .map(|m| {
-    })
+            if config.no_strip {
-    .map(|m| {
+                m
-        if config.no_strip {
+            } else {
-            m
+                strip_current_dir(&m).to_path_buf()
-        } else {
+            }
-            strip_current_dir(&m).to_path_buf()
+        });
-        }
-    });
     cmd.generate_and_execute_batch(paths, buffer_output)
 }

src/exec/mod.rs

@@ -144,7 +144,6 @@ impl CommandTemplate {
         out_perm: Arc<Mutex<()>>,
         buffer_output: bool,
     ) -> ExitCode {
-
         let mut cmd = Command::new(self.args[0].generate(&input, self.path_separator.as_deref()));
         for arg in &self.args[1..] {
             cmd.arg(arg.generate(&input, self.path_separator.as_deref()));

src/main.rs

@@ -376,7 +376,7 @@ fn construct_config(matches: clap::ArgMatches, pattern_regex: &str) -> Result<Co
                 }
             }),
         no_strip: matches.is_present("path") || matches.is_present("search-path"),
-        })
+    })
 }
 
 fn extract_command(

src/walk.rs

@@ -179,7 +179,13 @@ fn spawn_receiver(
         // This will be set to `Some` if the `--exec` argument was supplied.
         if let Some(ref cmd) = config.command {
             if cmd.in_batch_mode() {
-                exec::batch(rx, cmd, show_filesystem_errors, enable_output_buffering, &config)
+                exec::batch(
+                    rx,
+                    cmd,
+                    show_filesystem_errors,
+                    enable_output_buffering,
+                    &config,
+                )
             } else {
                 let shared_rx = Arc::new(Mutex::new(rx));
 

tests/tests.rs

@@ -1944,6 +1944,6 @@ fn test_no_strip() {
 
     te.assert_output(
         &["c.foo", "./", "-X", "echo"],
-        "./one/two/C.Foo2 ./one/two/c.foo"
+        "./one/two/C.Foo2 ./one/two/c.foo",
     )
 }