mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove check_output.

Browse Source 
Using `find` and `any` from `std` makes the code shorter and clearer.
This commit is contained in:
Nicholas Nethercote 2023-10-30 15:42:03 +11:00
parent a60d6438dc
commit 95b0088e7c
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/rustc_interface/src/passes.rs
View File

@ -392,34 +392,16 @@ fn generated_output_paths(
out_filenames out_filenames
} }
// Runs `f` on every output file path and returns the first non-None result, or None if `f`
// returns None for every file path.
fn check_output<F, T>(output_paths: &[PathBuf], f: F) -> Option<T>
where
F: Fn(&PathBuf) -> Option<T>,
{
for output_path in output_paths {
if let Some(result) = f(output_path) {
return Some(result);
}
}
None
}
fn output_contains_path(output_paths: &[PathBuf], input_path: &Path) -> bool { fn output_contains_path(output_paths: &[PathBuf], input_path: &Path) -> bool {
let input_path = try_canonicalize(input_path).ok(); let input_path = try_canonicalize(input_path).ok();
if input_path.is_none() { if input_path.is_none() {
return false; return false;
} }
let check = |output_path: &PathBuf| { output_paths.iter().any(|output_path| try_canonicalize(output_path).ok() == input_path)
if try_canonicalize(output_path).ok() == input_path { Some(()) } else { None }
};
check_output(output_paths, check).is_some()
} }
fn output_conflicts_with_dir(output_paths: &[PathBuf]) -> Option<PathBuf> { fn output_conflicts_with_dir(output_paths: &[PathBuf]) -> Option<&PathBuf> {
let check = |output_path: &PathBuf| output_path.is_dir().then(|| output_path.clone()); output_paths.iter().find(|output_path| output_path.is_dir())
check_output(output_paths, check)
} }
fn escape_dep_filename(filename: &str) -> String { fn escape_dep_filename(filename: &str) -> String {