itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(source): Flatten list_files_walk

Browse Source 
This prepares the way for moving `walk` from `read_packages` into here.
This commit is contained in:
Ed Page 2024-07-10 14:14:36 -05:00
parent 7128c76105
commit 53e5f2bbca
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cargo/sources/path.rs
View File

@ -466,7 +466,9 @@ fn _list_files(pkg: &Package, gctx: &GlobalContext) -> CargoResult<Vec<PathBuf>>
return list_files_gix(pkg, &repo, &filter, gctx);
}
}
list_files_walk(pkg, &filter, gctx)
let mut ret = Vec::new();
list_files_walk(pkg.root(), &mut ret, true, &filter, gctx)?;
Ok(ret)
}
/// Returns [`Some(gix::Repository)`](gix::Repository) if the discovered repository
@ -637,7 +639,7 @@ fn list_files_gix(
files.extend(list_files_gix(pkg, &sub_repo, filter, gctx)?);
}
Err(_) => {
walk(&file_path, &mut files, false, filter, gctx)?;
list_files_walk(&file_path, &mut files, false, filter, gctx)?;
}
}
} else if (filter)(&file_path, is_dir) {
@ -656,17 +658,6 @@ fn list_files_gix(
/// This is a fallback for [`list_files_gix`] when the package
/// is not tracked under a Git repository.
fn list_files_walk(
pkg: &Package,
filter: &dyn Fn(&Path, bool) -> bool,
gctx: &GlobalContext,
) -> CargoResult<Vec<PathBuf>> {
let mut ret = Vec::new();
walk(pkg.root(), &mut ret, true, filter, gctx)?;
Ok(ret)
}
/// Helper recursive function for [`list_files_walk`].
fn walk(
path: &Path,
ret: &mut Vec<PathBuf>,
is_root: bool,