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

walk: Simplify the code in scan() a bit

Browse source
This commit is contained in:
Tavian Barnes 2022-10-24 11:38:20 -04:00 committed by David Peter
parent cd8ec44abf
commit 93e5488420
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/walk.rs
View file

@ -49,14 +49,11 @@ pub const DEFAULT_MAX_BUFFER_TIME: Duration = Duration::from_millis(100);
/// If the `--exec` argument was supplied, this will create a thread pool for executing /// If the `--exec` argument was supplied, this will create a thread pool for executing
/// jobs in parallel from a given command line and the discovered paths. Otherwise, each /// jobs in parallel from a given command line and the discovered paths. Otherwise, each
/// path will simply be written to standard output. /// path will simply be written to standard output.
pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<Config>) -> Result<ExitCode> { pub fn scan(paths: &[PathBuf], pattern: Arc<Regex>, config: Arc<Config>) -> Result<ExitCode> {
let mut path_iter = path_vec.iter(); let first_path = &paths[0];
let first_path_buf = path_iter
.next()
.expect("Error: Path vector can not be empty");
let (tx, rx) = channel(); let (tx, rx) = channel();
let mut override_builder = OverrideBuilder::new(first_path_buf.as_path()); let mut override_builder = OverrideBuilder::new(first_path);
for pattern in &config.exclude_patterns { for pattern in &config.exclude_patterns {
override_builder override_builder
@ -67,7 +64,7 @@ pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<Config>) -> R
.build() .build()
.map_err(|_| anyhow!("Mismatch in exclude patterns"))?; .map_err(|_| anyhow!("Mismatch in exclude patterns"))?;
let mut walker = WalkBuilder::new(first_path_buf.as_path()); let mut walker = WalkBuilder::new(first_path);
walker walker
.hidden(config.ignore_hidden) .hidden(config.ignore_hidden)
.ignore(config.read_fdignore) .ignore(config.read_fdignore)
@ -121,8 +118,8 @@ pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<Config>) -> R
} }
} }
for path_entry in path_iter { for path in &paths[1..] {
walker.add(path_entry.as_path()); walker.add(path);
} }
let parallel_walker = walker.threads(config.threads).build_parallel(); let parallel_walker = walker.threads(config.threads).build_parallel();