1849ad1 · helix · git.iko.soy

1712 .max_depth(file_picker_config.max_depth)

1713 .build_parallel()

1714 .run(|| {

1715− let mut searcher_cl = searcher.clone();

1715+ let mut searcher = searcher.clone();

1716− let matcher_cl = matcher.clone();

1716+ let matcher = matcher.clone();

1717− let all_matches_sx_cl = all_matches_sx.clone();

1717+ let all_matches_sx = all_matches_sx.clone();

1718− Box::new(move |dent: Result<DirEntry, ignore::Error>| -> WalkState {

1718+ Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {

1719− let dent = match dent {

1719+ let entry = match entry {

1720− Ok(dent) => dent,

1720+ Ok(entry) => entry,

1721 Err(_) => return WalkState::Continue,

1722 };

1723

1724− match dent.file_type() {

1724+ match entry.file_type() {

1725− Some(fi) => {

1726− if !fi.is_file() {

1725+ Some(entry) if entry.is_file() => {}

1727− return WalkState::Continue;

1726+ // skip everything else

1728− }

1729− }

1730− None => return WalkState::Continue,

1727+ _ => return WalkState::Continue,

1731− }

1728+ };

1732

1729

1730+ let result = searcher.search_path(

1731+ &matcher,

1732+ entry.path(),

1733− let result_sink = sinks::UTF8(|line_num, _| {

1733+ sinks::UTF8(|line_num, _| {

1734− match all_matches_sx_cl

1734+ all_matches_sx

1735− .send((line_num as usize - 1, dent.path().to_path_buf()))

1735+ .send((line_num as usize - 1, entry.path().to_path_buf()))

1736− {

1736+ .unwrap();

1737+

1737− Ok(_) => Ok(true),

1738+ Ok(true)

1738− Err(_) => Ok(false),

1739− }

1739+ }),

1740− });

1740+ );

1741− let result =

1742− searcher_cl.search_path(&matcher_cl, dent.path(), result_sink);

1743

1741

1744 if let Err(err) = result {

1742 if let Err(err) = result {

1745 log::error!(

1743 log::error!(

1746 "Global search error: {}, {}",

1744 "Global search error: {}, {}",

1747− dent.path().display(),

1745+ entry.path().display(),

1748 err

1746 err

1749 );

1747 );

1750 }

1748 }