Robot/fd
1
0
Fork 0
mirror of https://github.com/sharkdp/fd.git synced 2024-11-18 18:00:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename error_if_any_error to merge_exitcodes

Browse source
This commit is contained in:
fusillicode 2020-02-22 09:08:56 +01:00 committed by David Peter
parent e23398e6d0
commit 232e3937f2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/exec/job.rs
View file

@ -7,7 +7,7 @@
// according to those terms.
use super::CommandTemplate;
use crate::exit_codes::{ExitCode, error_if_any_error};
use crate::exit_codes::{ExitCode, merge_exitcodes};
use crate::walk::WorkerResult;
use std::path::PathBuf;
use std::sync::mpsc::Receiver;
@ -46,7 +46,7 @@ pub fn job(
results.push(cmd.generate_and_execute(&value, Arc::clone(&out_perm)))
}
// Returns error in case of any error.
error_if_any_error(results)
merge_exitcodes(results)
}
pub fn batch(

2
src/exit_codes.rs
View file

@ -23,7 +23,7 @@ impl ExitCode {
}
}
pub fn error_if_any_error(results: Vec<ExitCode>) -> ExitCode {
pub fn merge_exitcodes(results: Vec<ExitCode>) -> ExitCode {
if results.iter().any(ExitCode::is_error) {
return ExitCode::GeneralError;
}

4
src/walk.rs
View file

@ -7,7 +7,7 @@
// according to those terms.
use crate::exec;
use crate::exit_codes::{ExitCode, error_if_any_error};
use crate::exit_codes::{ExitCode, merge_exitcodes};
use crate::fshelper;
use crate::internal::{opts::FdOptions, osstr_to_bytes, MAX_BUFFER_LENGTH};
use crate::output;
@ -182,7 +182,7 @@ fn spawn_receiver(
results.push(h.join().unwrap());
}
error_if_any_error(results)
merge_exitcodes(results)
}
} else {
let start = time::Instant::now();